ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix undefined args access for x86_64."

Browse source
This commit is contained in:
Elliott Hughes 2014-02-26 21:28:27 +00:00 • committed by Gerrit Code Review
commit ecb5dd697c
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libutils/String8.cpp
View file

@ -323,8 +323,17 @@ status_t String8::appendFormat(const char* fmt, ...)
status_t String8::appendFormatV(const char* fmt, va_list args) status_t String8::appendFormatV(const char* fmt, va_list args)
{ {
int result = NO_ERROR; int n, result = NO_ERROR;
int n = vsnprintf(NULL, 0, fmt, args); va_list tmp_args;
/* args is undefined after vsnprintf.
* So we need a copy here to avoid the
* second vsnprintf access undefined args.
*/
va_copy(tmp_args, args);
n = vsnprintf(NULL, 0, fmt, tmp_args);
va_end(tmp_args);
if (n != 0) { if (n != 0) {
size_t oldLength = length(); size_t oldLength = length();
char* buf = lockBuffer(oldLength + n); char* buf = lockBuffer(oldLength + n);