Merge remote-tracking branch 'origin/master' into vagrant-ci

1 files changed, 6 insertions, 5 deletions

diff --git a/src/misc.c b/src/misc.c
index 122497d..fdebff9 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -19,6 +19,7 @@
 
 #include "misc.h"
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -166,7 +167,7 @@ bool path_starts_with(const char *path, const char* prefix, size_t prefix_len)
 
         const char* path_part = path + (prefix_part - prefix);
         const char* path_slash = strchr(path_part, '/');
-        size_t path_part_len = path_slash ? path_slash - path_part : path_len - (path_part - path);
+        size_t path_part_len = path_slash ? (size_t)(path_slash - path_part) : path_len - (path_part - path);
 
         return prefix_part_len == path_part_len;
     }
@@ -328,12 +329,12 @@ void grow_memory_block(struct memory_block *a, size_t amount)
             if (new_cap == 0) {
                 new_cap = 8;
             } else {
+                if (new_cap > SIZE_MAX / 2) {
+                    fprintf(stderr, "Memory block too large.");
+                    abort();
+                }
                 new_cap *= 2;
             }
-            if (new_cap < 0) {  // Overflow
-                fprintf(stderr, "Memory block too large.");
-                abort();
-            }
         }
         a->ptr = (char *)realloc(a->ptr, new_cap);
         a->capacity = new_cap;