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

Commit 49c410bc authored by Sergio Giro's avatar Sergio Giro Committed by Android (Google) Code Review
Browse files

Merge "Add bound checks to utf16_to_utf8" into nyc-mr1-dev

parents acdd6395 4781057e

tools/aapt/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -57,8 +57,8 @@ aaptTests := \ 
aaptHostStaticLibs := \

aaptHostStaticLibs := \

    libandroidfw \

    libandroidfw \

    libpng \

    libpng \

    liblog \

    libutils \

    libutils \

    liblog \

    libcutils \

    libcutils \

    libexpat \

    libexpat \

    libziparchive-host \

    libziparchive-host \

tools/aapt2/util/Util.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -441,8 +441,10 @@ std::string utf16ToUtf8(const StringPiece16& utf16) { 
    }

    }





    std::string utf8;

    std::string utf8;

    // Make room for '\0' explicitly.

    utf8.resize(utf8Length + 1);

    utf16_to_utf8(utf16.data(), utf16.length(), &*utf8.begin(), utf8Length + 1);

    utf8.resize(utf8Length);

    utf8.resize(utf8Length);

    utf16_to_utf8(utf16.data(), utf16.length(), &*utf8.begin());

    return utf8;

    return utf8;

}

}

tools/split-select/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -47,8 +47,8 @@ hostStaticLibs := \ 
    libaapt \

    libaapt \

    libandroidfw \

    libandroidfw \

    libpng \

    libpng \

    liblog \

    libutils \

    libutils \

    liblog \

    libcutils \

    libcutils \

    libexpat \

    libexpat \

    libziparchive-host \

    libziparchive-host \