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

Commit 851c62d4 authored by Greg Kaiser's avatar Greg Kaiser
Browse files

Grab pointer into array post-resize() 

This is a defensive change.  The current code is safe due to the
resize() which happens 30 lines above this one.  However, if that
resize() were to change or disappear, then this code would be
dangerous, as the resize() could potentially cause a reallocation,
and move our memory buffer.

Since it's no additional cost to grab the pointer into the
array after the resize(), we do that.

Bug: 232940948
Test: TreeHugger
Change-Id: I29b6cbeb064c7654eb21d2e42e05a0587604c32b
parent e094dce2

libs/androidfw/Util.cpp

+3 −2
Original line number Diff line number Diff line
@@ -151,8 +151,9 @@ std::string ModifiedUtf8ToUtf8(const std::string& modified_utf8) { 
        }



        // Encode the UTF-8 representation of the codepoint into the string

        char* start = &output[output.size()];

        output.resize(output.size() + utf8_length);

        const size_t start_index = output.size();

        output.resize(start_index + utf8_length);

        char* start = &output[start_index];

        utf32_to_utf8((char32_t*)&codepoint, 1, start, utf8_length + 1);



        index = next_index;