os: fix missing NULL check for vpnprintf()
Protect from NULL parameter to %s directive. See also: https://github.com/X11Libre/xserver/issues/36 Signed-off-by: Herman Semenov <GermanAizek@yandex.ru> Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
parent
fa7cc111e7
commit
d042e5a667
6
os/log.c
6
os/log.c
|
@ -449,8 +449,10 @@ vpnprintf(char *string, int size_in, const char *f, va_list args)
|
||||||
case 's':
|
case 's':
|
||||||
string_arg = va_arg(args, char*);
|
string_arg = va_arg(args, char*);
|
||||||
|
|
||||||
for (i = 0; string_arg[i] != 0 && s_idx < size - 1 && s_idx < precision; i++)
|
if (string_arg) {
|
||||||
string[s_idx++] = string_arg[i];
|
for (i = 0; string_arg[i] != 0 && s_idx < size - 1 && s_idx < precision; i++)
|
||||||
|
string[s_idx++] = string_arg[i];
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'u':
|
case 'u':
|
||||||
|
|
Loading…
Reference in New Issue