1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
Description: Fix a couple of issues reported by cppcheck.
Forwarded: no
Author: Peter Pentchev <roam@ringlet.net>
Last-Update: 2023-01-05
--- a/src/lib/comp/nocomp/nocomp.c
+++ b/src/lib/comp/nocomp/nocomp.c
@@ -49,7 +49,7 @@
ALLOCD_INT(zck, comp);
*dst = zmalloc(src_size);
- if (!dst) {
+ if (!*dst) {
zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__);
return 0;
}
--- a/src/lib/comp/zstd/zstd.c
+++ b/src/lib/comp/zstd/zstd.c
@@ -144,7 +144,7 @@
}
*dst = zmalloc(max_size);
- if (!dst) {
+ if (!*dst) {
zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__);
return false;
}
--- a/src/lib/hash/hash.c
+++ b/src/lib/hash/hash.c
@@ -316,7 +316,7 @@
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 @@
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 @@
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);
--- a/src/lib/header.c
+++ b/src/lib/header.c
@@ -341,13 +341,13 @@
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 */
--- a/src/lib/zck.c
+++ b/src/lib/zck.c
@@ -437,7 +437,7 @@
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;
|
