]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
hexdecoct: add missing NULL check
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 6 Dec 2022 21:58:23 +0000 (06:58 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 8 Dec 2022 19:54:43 +0000 (04:54 +0900)
Fixes oss-fuzz#54065 (https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=54065).

Fixes #25650.

src/basic/hexdecoct.c
test/fuzz/fuzz-resource-record/oss-fuzz-54065 [new file with mode: 0644]

index 0922a49bb17a0336e8b8f4fe8cb795f52dfa45e4..b9de5bfcdaf91f5e3c7fc726b31efbc829dbef32 100644 (file)
@@ -606,7 +606,7 @@ ssize_t base64mem_full(
         if (!r)
                 return -ENOMEM;
 
-        for (x = p; x < (const uint8_t*) p + (l / 3) * 3; x += 3) {
+        for (x = p; x && x < (const uint8_t*) p + (l / 3) * 3; x += 3) {
                 /* x[0] == XXXXXXXX; x[1] == YYYYYYYY; x[2] == ZZZZZZZZ */
                 maybe_line_break(&z, r, line_break);
                 *(z++) = base64char(x[0] >> 2);                    /* 00XXXXXX */
diff --git a/test/fuzz/fuzz-resource-record/oss-fuzz-54065 b/test/fuzz/fuzz-resource-record/oss-fuzz-54065
new file mode 100644 (file)
index 0000000..9439452
Binary files /dev/null and b/test/fuzz/fuzz-resource-record/oss-fuzz-54065 differ