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

Commit bce11021 authored by Sergio Giro's avatar Sergio Giro
Browse files

Add bound checks to utf16_to_utf8 

Test: ran libaapt2_tests64
Bug: 29250543
Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3
(cherry picked from commit 4781057e)
parent 6ae7a5f7

tools/aapt/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ aaptHostLdLibs := 
aaptHostStaticLibs := \

    libandroidfw \

    libpng \

    liblog \

    libutils \

    liblog \

    libcutils \

    libexpat \

    libziparchive-host \

tools/aapt2/Util.cpp

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



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

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

    return utf8;

}

tools/split-select/Android.mk

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

    libandroidfw \

    libpng \

    liblog \

    libutils \

    liblog \

    libcutils \

    libexpat \

    libziparchive-host \