Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore resources from unknown types

Browse Source 
When loading binary APKs into aapt2 for dumping purposes, aapt2 allows
the presence of custom resource types in the resources.arsc. Since
apapt2 may not be able to correctly interpret the data of custom types,
ignore resources from custom types completely when constructing the
ResourceTable data structure for the APK.

Bug: 168247188
Bug: 36051266
Test: run aapt2 dump bading/resources on APKs from both bugs
Change-Id: Ia3c0b4e07457eb8634b5a256ef77270e99b8bd72
This commit is contained in:
Ryan Mitchell
2020-09-14 11:55:43 -07:00
parent bf511ddcea
commit 19e1a5b4c8
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt2/Resource.cpp
View File

@@ -96,8 +96,6 @@ StringPiece to_string(ResourceType type) {
return "styleable"; return "styleable";
case ResourceType::kTransition: case ResourceType::kTransition:
return "transition"; return "transition";
case ResourceType::kUnknown:
return "unknown";
case ResourceType::kXml: case ResourceType::kXml:
return "xml"; return "xml";
} }

5
tools/aapt2/Resource.h
View File

@@ -66,11 +66,6 @@ enum class ResourceType {
kStyle, kStyle,
kStyleable, kStyleable,
kTransition, kTransition,
// Not a parsed type. It is only used when loading resource tables that may have modified type
// names
kUnknown,
kXml, kXml,
}; };

21
tools/aapt2/format/binary/BinaryResourceParser.cpp
View File

@@ -352,15 +352,15 @@ bool BinaryResourceParser::ParseType(const ResourceTablePackage* package,
config.copyFromDtoH(type->config); config.copyFromDtoH(type->config);
const std::string type_str = util::GetString(type_pool_, type->id - 1); const std::string type_str = util::GetString(type_pool_, type->id - 1);
const ResourceType* parsed_type = ParseResourceType(type_str);
// Be lenient on the name of the type if the table is lenient on resource validation. if (!parsed_type) {
auto parsed_type = ResourceType::kUnknown; // Be lenient on the name of the type if the table is lenient on resource validation.
if (const ResourceType* parsed = ParseResourceType(type_str)) { bool log_error = table_->GetValidateResources();
parsed_type = *parsed; if (log_error) {
} else if (table_->GetValidateResources()) { diag_->Error(DiagMessage(source_) << "invalid type name '" << type_str
diag_->Error(DiagMessage(source_) << "invalid type name '" << type_str << "' for type with ID " << "' for type with ID " << type->id);
<< (int) type->id); }
return false; return !log_error;
} }
TypeVariant tv(type); TypeVariant tv(type);
@@ -370,9 +370,8 @@ bool BinaryResourceParser::ParseType(const ResourceTablePackage* package,
continue; continue;
} }
const ResourceName name(package->name, parsed_type, const ResourceName name(package->name, *parsed_type,
util::GetString(key_pool_, util::DeviceToHost32(entry->key.index))); util::GetString(key_pool_, util::DeviceToHost32(entry->key.index)));
const ResourceId res_id(package->id.value(), type->id, static_cast<uint16_t>(it.index())); const ResourceId res_id(package->id.value(), type->id, static_cast<uint16_t>(it.index()));
std::unique_ptr<Value> resource_value; std::unique_ptr<Value> resource_value;