diff options
| author | 2020-11-13 23:55:20 +0000 | |
|---|---|---|
| committer | 2020-11-13 23:55:20 +0000 | |
| commit | 55ef6167a2c235bd88c7216238b2001b46795b79 (patch) | |
| tree | 5a63ff5e6b8a0ade4ce5aa2c4d663d62a7d993d9 /tools/aapt/Resource.cpp | |
| parent | 6ca48473e533a8b89abac6294a0bb8130b8c8c89 (diff) | |
Revert "libandroidfw hardening for IncFs"
Revert "Move map_ptr to incfs namspace"
Revert submission 12787270
Reason for revert: b/173250495
Reverted Changes:
I5cd1bc8a2:libandroidfw hardening for IncFs
Ice5dbcfb2:Move map_ptr to incfs namspace
I29ccdc8ed:Do not cache bag parent stack until requested
I1e9e9acaa:Cache resolved theme values
Change-Id: Ib90ef68339710086df41e9abe0833a542d03a74f
Diffstat (limited to 'tools/aapt/Resource.cpp')
| -rw-r--r-- | tools/aapt/Resource.cpp | 2 |
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); |