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

Commit a790490e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [12364563, 12364330, 12364331, 12364332, 12363743,... 

Merge cherrypicks of [12364563, 12364330, 12364331, 12364332, 12363743, 12364605, 12363956, 12363957, 12363958, 12364309, 12364483, 12364484, 12364564, 12364333, 12364334, 12364335, 12364336, 12364337, 12364607] into rvc-release

Change-Id: Ie9f4226d1f67acd2680aac6e366b4c3b0e30933e
parents 6072de17 bad50ed2

libutils/String8.cpp

+7 −1
Original line number Original line 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);

    n = vsnprintf(nullptr, 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);