Merge pull request hpcc-systems#18990 from richardkchapman/HPCC-32430

HPCC-32430 Fix warnings in libbase58 Reviewed-by: Gavin Halliday <[email protected]> Merged-by: Gavin Halliday <[email protected]>
kenrowland · Sep 4, 2024 · 50293b1 · 50293b1
2 parents dc89635 + d0044c4
commit 50293b1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/system/libbase58/base58.c b/system/libbase58/base58.c
@@ -137,9 +137,9 @@ int b58check(const void *bin, size_t binsz, const char *base58str, size_t b58sz)
         return -1;
 
     // Check number of zeros is correct AFTER verifying checksum (to avoid possibility of accessing base58str beyond the end)
-    for (i = 0; binc[i] == '\0' && base58str[i] == '1'; ++i)
+    for (i = 0; i < binsz && binc[i] == '\0' && i < b58sz && base58str[i] == '1'; ++i)
     {}  // Just finding the end of zeros, nothing to do in loop
-    if (binc[i] == '\0' || base58str[i] == '1')
+    if (i >= binsz || binc[i] == '\0' || i >= b58sz || base58str[i] == '1')
         return -3;
 
     return binc[0];