commit b3504ca77537815c49f4d206a176d1650ac2b602
author Tom Cherry <tomcherry@google.com> Wed Jun 27 13:50:02 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 27 13:50:02 2018 -0700
tree 9bd25c52d9b32c628bd0f173a8b7cceca4a0a7d5
parent c07c8208a4d6eb593dda7a46fd04a4db9bb91f7c
parent c342a295f641464464f8e9cf346fb3539db44403

Merge "init: fix the parse error when meeting escape characters"
am: 78ea17a641

Change-Id: I55967f9ca86d92468dffa3ff5c0488dfe603bba9

init/tokenizer.cpp

diff --git a/init/tokenizer.cpp b/init/tokenizer.cpp
index f8d9b6b..bb143f1 100644
--- a/init/tokenizer.cpp
+++ b/init/tokenizer.cpp
@@ -85,15 +85,19 @@
                 goto textdone;
             case 'n':
                 *s++ = '\n';
+                x++;
                 break;
             case 'r':
                 *s++ = '\r';
+                x++;
                 break;
             case 't':
                 *s++ = '\t';
+                x++;
                 break;
             case '\\':
                 *s++ = '\\';
+                x++;
                 break;
             case '\r':
                     /* \ <cr> <lf> -> line continuation */
@@ -101,6 +105,7 @@
                     x++;
                     continue;
                 }
+                x++;
             case '\n':
                     /* \ <lf> -> line continuation */
                 state->line++;