am ca5fb0dc: am c6240e72: Fix large memory corruption in AAPT

status_t ResourceTable::Package::setTypeStrings(const sp<AaptFile>& data)

{

    mTypeStringsData = data;

    status_t err = setStrings(data, &mTypeStrings, &mTypeStringsMapping);

    if (err != NO_ERROR) {

        fprintf(stderr, "ERROR: Type string data is corrupt!\n");

    }

        return err;

    }

    // Retain a reference to the new data after we've successfully replaced

    // all uses of the old reference (in setStrings() ).

    mTypeStringsData = data;

    return NO_ERROR;

}

status_t ResourceTable::Package::setKeyStrings(const sp<AaptFile>& data)

{

    mKeyStringsData = data;

    status_t err = setStrings(data, &mKeyStrings, &mKeyStringsMapping);

    if (err != NO_ERROR) {

        fprintf(stderr, "ERROR: Key string data is corrupt!\n");

    }

        return err;

    }

    // Retain a reference to the new data after we've successfully replaced

    // all uses of the old reference (in setStrings() ).

    mKeyStringsData = data;

    return NO_ERROR;

}

status_t ResourceTable::Package::setStrings(const sp<AaptFile>& data,

                                            ResStringPool* strings,

                                            DefaultKeyedVector<String16, uint32_t>* mappings)