emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

0052-ps/output.c: Handle negative snprintf() return value.

Browse Source 
May happen if strlen(src) > INT_MAX for example. This patch prevents
escaped_copy() from increasing maxroom and returning -1 (= number of
bytes consumed in dst).

---------------------------- adapted for newlib branch
. formerly applied to proc/escape.c
. function was moved to ps/output.c

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Qualys Security Advisory 1970-01-01 00:00:00 +00:00 committed by Craig Small
parent f44fe715bd
commit 9caf95c0bd
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ps/output.c
View File

@ -126,6 +126,10 @@ static int escaped_copy(char *restrict dst, const char *restrict src, int bufsiz
if (bufsize > *maxroom+1) if (bufsize > *maxroom+1)
bufsize = *maxroom+1; bufsize = *maxroom+1;
n = snprintf(dst, bufsize, "%s", src); n = snprintf(dst, bufsize, "%s", src);
if (n < 0) {
*dst = '\0';
return 0;
}
if (n >= bufsize) if (n >= bufsize)
n = bufsize-1; n = bufsize-1;
*maxroom -= n; *maxroom -= n;