From c450d7a6c59a3c0311329987020020c1db93b478 Mon Sep 17 00:00:00 2001
From: Peter Pentchev <roam@ringlet.net>
Date: Fri, 12 Aug 2022 16:57:41 +0300
Subject: [PATCH] Fix a couple of issues reported by cppcheck.

Forwarded: no
Last-Update: 2022-08-12


Gbp-Pq: Name cppcheck.patch
---
 src/lib/comp/nocomp/nocomp.c | 2 +-
 src/lib/comp/zstd/zstd.c     | 2 +-
 src/lib/hash/hash.c          | 6 +++---
 src/lib/header.c             | 4 ++--
 src/lib/zck.c                | 2 +-
 test/zck_cmp_uncomp.c        | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/lib/comp/nocomp/nocomp.c b/src/lib/comp/nocomp/nocomp.c
index c6e80ba..e0a10bc 100644
--- a/src/lib/comp/nocomp/nocomp.c
+++ b/src/lib/comp/nocomp/nocomp.c
@@ -49,7 +49,7 @@ static ssize_t compress(zckCtx *zck, zckComp *comp, const char *src,
     ALLOCD_INT(zck, comp);
 
     *dst = zmalloc(src_size);
-    if (!dst) {
+    if (!*dst) {
         zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__);
         return 0;
     }
diff --git a/src/lib/comp/zstd/zstd.c b/src/lib/comp/zstd/zstd.c
index a12ddfe..8f25f4a 100644
--- a/src/lib/comp/zstd/zstd.c
+++ b/src/lib/comp/zstd/zstd.c
@@ -144,7 +144,7 @@ static bool end_cchunk(zckCtx *zck, zckComp *comp, char **dst, size_t *dst_size,
     }
 
     *dst = zmalloc(max_size);
-    if (!dst) {
+    if (!*dst) {
         zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__);
         return false;
     }
diff --git a/src/lib/hash/hash.c b/src/lib/hash/hash.c
index b40f1a2..eadb9ed 100644
--- a/src/lib/hash/hash.c
+++ b/src/lib/hash/hash.c
@@ -316,7 +316,7 @@ char *hash_finalize(zckCtx *zck, zckHash *hash) {
         unsigned char *digest = zmalloc(SHA1_DIGEST_LENGTH);
         if (!digest) {
            zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__);
-           return false;
+           return NULL;
         }
         SHA1_Final((sha1_byte*)digest, (SHA_CTX *)hash->ctx);
         hash_close(hash);
@@ -325,7 +325,7 @@ char *hash_finalize(zckCtx *zck, zckHash *hash) {
         unsigned char *digest = zmalloc(SHA256_DIGEST_SIZE);
         if (!digest) {
            zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__);
-           return false;
+           return NULL;
         }
         SHA256_Final(digest, (SHA256_CTX *)hash->ctx);
         hash_close(hash);
@@ -335,7 +335,7 @@ char *hash_finalize(zckCtx *zck, zckHash *hash) {
         unsigned char *digest = zmalloc(SHA512_DIGEST_SIZE);
         if (!digest) {
            zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__);
-           return false;
+           return NULL;
         }
         SHA512_Final(digest, (SHA512_CTX *)hash->ctx);
         hash_close(hash);
diff --git a/src/lib/header.c b/src/lib/header.c
index 56d7f1b..732cdbb 100644
--- a/src/lib/header.c
+++ b/src/lib/header.c
@@ -339,13 +339,13 @@ static bool lead_create(zckCtx *zck) {
     int phs = 5 + 2*MAX_COMP_SIZE + zck->hash_type.digest_size;
     char *header = zmalloc(phs);
     size_t length = 0;
-    memcpy(header, "\0ZCK1", 5);
-    length += 5;
 
     if (!header) {
 	    zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__);
 	    return false;
     }
+    memcpy(header, "\0ZCK1", 5);
+    length += 5;
     /* Write out full data and header hash type */
     compint_from_size(header + length, zck->hash_type.type, &length);
     /* Write out header length */
diff --git a/src/lib/zck.c b/src/lib/zck.c
index 61f92d8..50760cb 100644
--- a/src/lib/zck.c
+++ b/src/lib/zck.c
@@ -413,7 +413,7 @@ zckCtx ZCK_PUBLIC_API *zck_create() {
     zckCtx *zck = zmalloc(sizeof(zckCtx));
     if (!zck) {
        zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__);
-       return false;
+       return NULL;
     }
     zck_clear_error(NULL);
     zck->prep_hash_type = -1;
diff --git a/test/zck_cmp_uncomp.c b/test/zck_cmp_uncomp.c
index bdf9205..41dd05c 100644
--- a/test/zck_cmp_uncomp.c
+++ b/test/zck_cmp_uncomp.c
@@ -232,8 +232,8 @@ int main (int argc, char *argv[]) {
         iter = zck_get_next_chunk(iter);
     }
 
-    printf("\n\nTotal to be reused : %12lu\n", reuse);
-    printf("Total to be downloaded : %12lu\n", todwl);
+    printf("\n\nTotal to be reused : %12zu\n", reuse);
+    printf("Total to be downloaded : %12zu\n", todwl);
 
     close(in_fd);
     close(zck_fd);
-- 
2.30.2