technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Logging a NULL pointer instead of passing it in the memcpy().

Browse Source
This commit is contained in:
Andrei Zeliankou
2022-06-01 16:40:34 +01:00
parent 161230b955
commit caa05887ff
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/nxt_sprintf.c
View File

@@ -115,6 +115,7 @@ nxt_vsprintf(u_char *buf, u_char *end, const char *fmt, va_list args)
static const u_char hexadecimal[16] = "0123456789abcdef";
static const u_char HEXADECIMAL[16] = "0123456789ABCDEF";
static const u_char nan[] = "[nan]";
static const u_char null[] = "[null]";
static const u_char infinity[] = "[infinity]";
spf.end = end;
@@ -150,15 +151,18 @@ nxt_vsprintf(u_char *buf, u_char *end, const char *fmt, va_list args)
continue;
case 's':
fmt++;
p = va_arg(args, const u_char *);
if (nxt_fast_path(p != NULL)) {
if (nxt_slow_path(p == NULL)) {
goto copy;
}
while (*p != '\0' && buf < end) {
*buf++ = *p++;
}
}
fmt++;
continue;
case '*':
@@ -170,10 +174,8 @@ nxt_vsprintf(u_char *buf, u_char *end, const char *fmt, va_list args)
fmt++;
p = va_arg(args, const u_char *);
if (nxt_fast_path(p != NULL)) {
goto copy;
}
}
continue;
@@ -554,7 +556,15 @@ nxt_vsprintf(u_char *buf, u_char *end, const char *fmt, va_list args)
copy:
buf = nxt_cpymem(buf, p, nxt_min((size_t) (end - buf), length));
if (nxt_slow_path(p == NULL)) {
p = null;
length = nxt_length(null);
} else {
length = nxt_min((size_t) (end - buf), length);
}
buf = nxt_cpymem(buf, p, length);
continue;
}