diff options
Diffstat (limited to 'src/basic/hexdecoct.c')
| -rw-r--r-- | src/basic/hexdecoct.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/basic/hexdecoct.c b/src/basic/hexdecoct.c index 7748e8352c..c0f96409fd 100644 --- a/src/basic/hexdecoct.c +++ b/src/basic/hexdecoct.c @@ -79,7 +79,7 @@ static int unhex_next(const char **p, size_t *l) { assert(l); /* Find the next non-whitespace character, and decode it. We - * greedily skip all preceeding and all following whitespace. */ + * greedily skip all preceding and all following whitespace. */ for (;;) { if (*l == 0) @@ -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; @@ -647,7 +649,7 @@ static int unbase64_next(const char **p, size_t *l) { assert(l); /* Find the next non-whitespace character, and decode it. If we find padding, we return it as INT_MAX. We - * greedily skip all preceeding and all following whitespace. */ + * greedily skip all preceding and all following whitespace. */ for (;;) { if (*l == 0) |