commit 90959887e9a61ff83097b2789f8b3243ad817dec
author Adam Lesinski <adamlesinski@google.com> Mon Jul 06 18:09:18 2015 -0700
committer Adam Lesinski <adamlesinski@google.com> Tue Sep 15 17:42:15 2015 +0000
tree 638cf706e8d96bef9e86e7446f6cf94ff90a49ef
parent f8def4d40b100c114a19c7093040b3077039d30b

AAPT2: Fix issue with parsing escape sequences when the parser only gives us part at a time

Change-Id: I671955f350b57577a991dd88f6a7319ec0b36c07

tools/aapt2/Util.cpp

diff --git a/tools/aapt2/Util.cpp b/tools/aapt2/Util.cpp
index 03ecd1a..ca352e0 100644
--- a/tools/aapt2/Util.cpp
+++ b/tools/aapt2/Util.cpp
@@ -175,7 +175,51 @@
     const char16_t* start = str.begin();
     const char16_t* current = start;
     while (current != end) {
-        if (*current == u'"') {
+        if (mLastCharWasEscape) {
+            switch (*current) {
+                case u't':
+                    mStr += u'\t';
+                    break;
+                case u'n':
+                    mStr += u'\n';
+                    break;
+                case u'#':
+                    mStr += u'#';
+                    break;
+                case u'@':
+                    mStr += u'@';
+                    break;
+                case u'?':
+                    mStr += u'?';
+                    break;
+                case u'"':
+                    mStr += u'"';
+                    break;
+                case u'\'':
+                    mStr += u'\'';
+                    break;
+                case u'\\':
+                    mStr += u'\\';
+                    break;
+                case u'u': {
+                    current++;
+                    Maybe<char16_t> c = parseUnicodeCodepoint(&current, end);
+                    if (!c) {
+                        mError = "invalid unicode escape sequence";
+                        return *this;
+                    }
+                    mStr += c.value();
+                    current -= 1;
+                    break;
+                }
+
+                default:
+                    // Ignore.
+                    break;
+            }
+            mLastCharWasEscape = false;
+            start = current + 1;
+        } else if (*current == u'"') {
             if (!mQuote && mTrailingSpace) {
                 // We found an opening quote, and we have
                 // trailing space, so we should append that
@@ -208,52 +252,7 @@
             }
             mStr.append(start, current - start);
             start = current + 1;
-
-            current++;
-            if (current != end) {
-                switch (*current) {
-                    case u't':
-                        mStr += u'\t';
-                        break;
-                    case u'n':
-                        mStr += u'\n';
-                        break;
-                    case u'#':
-                        mStr += u'#';
-                        break;
-                    case u'@':
-                        mStr += u'@';
-                        break;
-                    case u'?':
-                        mStr += u'?';
-                        break;
-                    case u'"':
-                        mStr += u'"';
-                        break;
-                    case u'\'':
-                        mStr += u'\'';
-                        break;
-                    case u'\\':
-                        mStr += u'\\';
-                        break;
-                    case u'u': {
-                        current++;
-                        Maybe<char16_t> c = parseUnicodeCodepoint(&current, end);
-                        if (!c) {
-                            mError = "invalid unicode escape sequence";
-                            return *this;
-                        }
-                        mStr += c.value();
-                        current -= 1;
-                        break;
-                    }
-
-                    default:
-                        // Ignore.
-                        break;
-                }
-                start = current + 1;
-            }
+            mLastCharWasEscape = true;
         } else if (!mQuote) {
             // This is not quoted text, so look for whitespace.
             if (isspace16(*current)) {