diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2019-02-19 18:09:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-19 18:09:56 +0000 |
| commit | 975c6e2d26b0eecf669dc6f0b5cfb50e430f41f1 (patch) | |
| tree | 75e6b0fc6b75978d104b159fe4ecfb2ed46936a0 /tools/aapt2/ResourceParser.cpp | |
| parent | 311af9ea4bd8b599acf179bac973619fad4eb618 (diff) | |
| parent | 2f9077dfbbcdb72276a6cbbf9e9cdbf89ccbf16f (diff) | |
Merge "Fix seg faul when parsing invalid <plurals>"
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
| -rw-r--r-- | tools/aapt2/ResourceParser.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/aapt2/ResourceParser.cpp b/tools/aapt2/ResourceParser.cpp index c1887822ce7d..d0237f80a8f0 100644 --- a/tools/aapt2/ResourceParser.cpp +++ b/tools/aapt2/ResourceParser.cpp @@ -1637,7 +1637,9 @@ bool ResourceParser::ParsePlural(xml::XmlPullParser* parser, if (!(plural->values[index] = ParseXml( parser, android::ResTable_map::TYPE_STRING, kNoRawString))) { error = true; + continue; } + plural->values[index]->SetSource(item_source); } else if (!ShouldIgnoreElement(element_namespace, element_name)) { |