openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

libutils: check vsnprintf error 

For encoding errors, this function will return a negative value which
causes problems down the line. Check for an error and return. Also,
integer overflows are guarded.

Bug: 161894517
Test: fuzzer test case
Change-Id: Ia85067d4258bde4b875c832d6223db5dd26b8838
Merged-In: Ia85067d4258bde4b875c832d6223db5dd26b8838
(cherry picked from commit ee22384c54)
This commit is contained in:
Steven Moreland 2020-07-28 21:41:54 +00:00 committed by android-build-team Robot
parent 6072de17cd
commit bad50ed24f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libutils/String8.cpp
View File

@ -322,8 +322,14 @@ status_t String8::appendFormatV(const char* fmt, va_list args)
n = vsnprintf(nullptr, 0, fmt, tmp_args);
va_end(tmp_args);
if (n != 0) {
if (n < 0) return UNKNOWN_ERROR;
if (n > 0) {
size_t oldLength = length();
if ((size_t)n > SIZE_MAX - 1 ||
oldLength > SIZE_MAX - (size_t)n - 1) {
return NO_MEMORY;
}
char* buf = lockBuffer(oldLength + n);
if (buf) {
vsnprintf(buf + oldLength, n + 1, fmt, args);