From 2f9077dfbbcdb72276a6cbbf9e9cdbf89ccbf16f Mon Sep 17 00:00:00 2001
From: Ryan Mitchell <rtmitchell@google.com>
Date: Fri, 15 Feb 2019 16:02:09 -0800
Subject: Fix seg faul when parsing invalid <plurals>

If the inner element of a <plurals> tag fails to parse, aapt2 will seg
fault. Don't do that.

Bug: 123423125
Test: manual
Change-Id: Iff39fa84073da62d85279683ac3d03b7309bc5e3
---
 tools/aapt2/ResourceParser.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tools/aapt2/ResourceParser.cpp')

diff --git a/tools/aapt2/ResourceParser.cpp b/tools/aapt2/ResourceParser.cpp
index 2f8ca2d62061..7827e950a602 100644
--- a/tools/aapt2/ResourceParser.cpp
+++ b/tools/aapt2/ResourceParser.cpp
@@ -1623,7 +1623,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)) {
-- 
cgit v1.2.3-59-g8ed1b