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

Commit f2d2c871 authored by Adam Lesinski's avatar Adam Lesinski Committed by Xavier Ducrohet
Browse files

AAPT should not process XML that failed to compile 

AAPT would attempt to warn if an unprefixed 'id'
attribute was used in an XML resource file even
if that XML file failed to compile. The result
was undefined behaviour, including crashing the
process.

Change-Id: I1a9464ec937760e8d38bbe1af8d1b5d6b2c105a2
parent fd876194

tools/aapt/Resource.cpp

+5 −4
Original line number Diff line number Diff line
@@ -1236,12 +1236,13 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets) 
        while ((err=it.next()) == NO_ERROR) {

            String8 src = it.getFile()->getPrintableSource();

            err = compileXmlFile(assets, it.getFile(), &table, xmlFlags);

            if (err != NO_ERROR) {

                hasErrors = true;

            }

            if (err == NO_ERROR) {

                ResXMLTree block;

                block.setTo(it.getFile()->getData(), it.getFile()->getSize(), true);

                checkForIds(src, block);

            } else {

                hasErrors = true;

            }

        }



        if (err < NO_ERROR) {