vsprintf: pre-calculate final string length for later use
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com> Acked-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
0f4f81dce9
commit
6c35663411
|
@ -1496,13 +1496,14 @@ do { \
|
||||||
case FORMAT_TYPE_STR: {
|
case FORMAT_TYPE_STR: {
|
||||||
const char *save_str = va_arg(args, char *);
|
const char *save_str = va_arg(args, char *);
|
||||||
size_t len;
|
size_t len;
|
||||||
|
|
||||||
if ((unsigned long)save_str > (unsigned long)-PAGE_SIZE
|
if ((unsigned long)save_str > (unsigned long)-PAGE_SIZE
|
||||||
|| (unsigned long)save_str < PAGE_SIZE)
|
|| (unsigned long)save_str < PAGE_SIZE)
|
||||||
save_str = "(null)";
|
save_str = "(null)";
|
||||||
len = strlen(save_str);
|
len = strlen(save_str) + 1;
|
||||||
if (str + len + 1 < end)
|
if (str + len < end)
|
||||||
memcpy(str, save_str, len + 1);
|
memcpy(str, save_str, len);
|
||||||
str += len + 1;
|
str += len;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue