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

Commit a8995adc authored by Dan Albert's avatar Dan Albert
Browse files

Don't check for null references. 

The address of a reference will never be null in well formed C++ code.
The function returning the value being checked simply returns a
dereferenced pointer (which is just going to segfault if it is null!).

Change-Id: I3a4eb6adfc003c63ebf21b81d46088d52154d99d
parent f4eaaadb

tools/aapt/Command.cpp

+2 −11
Original line number Diff line number Diff line
@@ -197,14 +197,10 @@ int doList(Bundle* bundle) 
        }



        const ResTable& res = assets.getResources(false);

        if (&res == NULL) {

            printf("\nNo resource table found.\n");

        } else {

#ifndef HAVE_ANDROID_OS

        printf("\nResource table:\n");

        res.print(false);

#endif

        }



        Asset* manifestAsset = assets.openNonAsset("AndroidManifest.xml",

                                                   Asset::ACCESS_BUFFER);
@@ -531,11 +527,6 @@ int doDump(Bundle* bundle) 
    assets.setConfiguration(config);



    const ResTable& res = assets.getResources(false);

    if (&res == NULL) {

        fprintf(stderr, "ERROR: dump failed because no resource table was found\n");

        goto bail;

    }



    if (strcmp("resources", option) == 0) {

#ifndef HAVE_ANDROID_OS

        res.print(bundle->getValues());