Commit ce44c8ac authored Aug 04, 2020 by Steven Moreland Committed by Automerger Merge Worker Aug 04, 2020

Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d5 am:...

Merge "libutils: check vsnprintf error" into oc-dev am: a03d37d5 am: d8801aaa am: d05ecb8d am: dc99a094 am: 64b312bb am: 0cb14f1f

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12254459

Change-Id: I1cb83a4a22e205dddd10536f61392215d5cb33dc

libutils/String8.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -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);