Merge pull request #10249 from keszybz/lgtm-fixes

Fixes for issues found by LGTM
2018-10-02 17:42:55 +02:00
parent afc1feaeba 91db8ed5b2
commit eb74d3b97a
7 changed files with 22 additions and 17 deletions
@@ -592,8 +592,7 @@ static int base64_append_width(

        _cleanup_free_ char *x = NULL;
        char *t, *s;
-        ssize_t slen, len, avail;
-        int line, lines;
+        ssize_t len, slen, avail, line, lines;

        len = base64mem(p, l, &x);
        if (len <= 0)
@@ -602,6 +601,9 @@ static int base64_append_width(
        lines = DIV_ROUND_UP(len, width);

        slen = strlen_ptr(sep);
+        if (lines > (SSIZE_MAX - plen - 1 - slen) / (indent + width + 1))
+                return -ENOMEM;
+
        t = realloc(*prefix, plen + 1 + slen + (indent + width + 1) * lines);
        if (!t)
                return -ENOMEM;