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

Commit 3fb8c9b5 authored by Adam Lesinski's avatar Adam Lesinski
Browse files

AAPT: Don't crash on illegal symbol name 

We never checked the return value when adding a nested
symbol, which would be NULL if the symbol name was invalid.

External bug: https://code.google.com/p/android/issues/detail?id=75876

Change-Id: I5211f4d4b87897d52f2b6e5907113d31930bb92d
parent 97e75e1d

tools/aapt/ResourceTable.cpp

+6 −2
Original line number Diff line number Diff line
@@ -2574,8 +2574,12 @@ status_t ResourceTable::addSymbols(const sp<AaptSymbols>& outSymbols) { 
                continue;

            }

            const size_t N = t->getOrderedConfigs().size();

            sp<AaptSymbols> typeSymbols;

            typeSymbols = outSymbols->addNestedSymbol(String8(t->getName()), t->getPos());

            sp<AaptSymbols> typeSymbols =

                    outSymbols->addNestedSymbol(String8(t->getName()), t->getPos());

            if (typeSymbols == NULL) {

                return UNKNOWN_ERROR;

            }



            for (size_t ci=0; ci<N; ci++) {

                sp<ConfigList> c = t->getOrderedConfigs().itemAt(ci);

                if (c == NULL) {