Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d05ecb8d authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ifa0692e4966e78f4e180a2efc53db991177b6006
parents 84dcff4c d8801aaa

libutils/String8.cpp

+7 −1
Original line number Original line Diff line number Diff line
@@ -346,8 +346,14 @@ status_t String8::appendFormatV(const char* fmt, va_list args) 
    n = vsnprintf(NULL, 0, fmt, tmp_args);

    n = vsnprintf(NULL, 0, fmt, tmp_args);

    va_end(tmp_args);

    va_end(tmp_args);





    if (n != 0) {

    if (n < 0) return UNKNOWN_ERROR;



    if (n > 0) {

        size_t oldLength = length();

        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);

        char* buf = lockBuffer(oldLength + n);

        if (buf) {

        if (buf) {

            vsnprintf(buf + oldLength, n + 1, fmt, args);

            vsnprintf(buf + oldLength, n + 1, fmt, args);