summaryrefslogtreecommitdiff
path: root/tools/aapt/Resource.cpp
diff options
context:
space:
mode:
author Tej Singh <singhtejinder@google.com> 2020-11-14 03:22:09 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-11-14 03:22:09 +0000
commit18a3a6644df14e1b87aa231ceed779ed32c2c229 (patch)
tree4ee79bdbcb837322b48f73c27868d26aef50d303 /tools/aapt/Resource.cpp
parentf766eaccaaadfb1db12ac685367c20ffff8fa63e (diff)
parent55ef6167a2c235bd88c7216238b2001b46795b79 (diff)
Merge changes from topic "revert-12787270-FYIHXORGZY"
* changes: Revert "libandroidfw hardening for IncFs" Revert "Cache resolved theme values" Revert "Do not cache bag parent stack until requested"
Diffstat (limited to 'tools/aapt/Resource.cpp')
-rw-r--r--tools/aapt/Resource.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index dd3ebdbdea09..ab6dced5b67d 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -519,7 +519,7 @@ static int validateAttr(const String8& path, const ResTable& table,
String8(parser.getElementName(&len)).string(), attr);
return ATTR_NOT_FOUND;
}
- if ((str = UnpackOptionalString(pool->stringAt(value.data), &len)) == NULL) {
+ if ((str=pool->stringAt(value.data, &len)) == NULL) {
fprintf(stderr, "%s:%d: Tag <%s> attribute %s has corrupt string value.\n",
path.string(), parser.getLineNumber(),
String8(parser.getElementName(&len)).string(), attr);