ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib/colors: assert rathen than overflow [-Wnull-dereference] 

lib/colors.c: In function 'colors_read_schemes':
lib/colors.c:412:7: warning: potential null pointer dereference [-Wnull-dereference]

Reported-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2017-03-13 14:44:22 +01:00
parent bd2aece45e
commit ab7093775f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/colors.c
View File

@ -342,6 +342,7 @@ static char *colors_get_homedir(char *buf, size_t bufsz)
static int cn_sequence(const char *str, char **seq)
{
char *in, *out;
int len;
if (!str)
return -EINVAL;
@ -357,7 +358,7 @@ static int cn_sequence(const char *str, char **seq)
}
/* convert xx;yy sequences to "\033[xx;yy" */
if (asprintf(seq, "\033[%sm", str) < 1)
if ((len = asprintf(seq, "\033[%sm", str)) < 1)
return -ENOMEM;
for (in = *seq, out = *seq; in && *in; in++) {
@ -409,6 +410,8 @@ static int cn_sequence(const char *str, char **seq)
}
in++;
}
assert ((out - *seq) <= len);
*out = '\0';
return 0;