lib: p_strarray_dup() - Harden against integer overflows

diff --git a/src/lib/strfuncs.c b/src/lib/strfuncs.c
index 7ff107101800a7afebf759f86e87c43215c05fad..134313b696163f4a6dbd8ac7925ebc7d94f5841b 100644 (file)
--- a/src/lib/strfuncs.c
+++ b/src/lib/strfuncs.c
@@ -954,9 +954,10 @@ const char **p_strarray_dup(pool_t pool, const char *const *arr)
        char *p;
        size_t len, size = sizeof(const char *);
 
-       /* @UNSAFE: integer overflow checks are missing */
-       for (i = 0; arr[i] != NULL; i++)
-               size += sizeof(const char *) + strlen(arr[i]) + 1;
+       for (i = 0; arr[i] != NULL; i++) {
+               size = MALLOC_ADD3(size, sizeof(const char *) + 1,
+                                  strlen(arr[i]));
+       }
 
        ret = p_malloc(pool, size);
        p = PTR_OFFSET(ret, sizeof(const char *) * (i + 1));