From: Daiki Ueno <ueno@gnu.org>
Date: Mon, 29 Sep 2014 23:25:44 +0000 (+0900)
Subject: c: Fix octal character escape handling
X-Git-Tag: v0.19.2.1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=883001928eacb62fdf2a5c7da0f38e08148b0fcf;p=thirdparty%2Fgettext.git

c: Fix octal character escape handling

* gettext-tools/src/x-c.c (literalstring_parse): Fix octal character
escape handling.
Reported by Kjartan Maraas at:
<https://bugzilla.redhat.com/show_bug.cgi?id=1147535>.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index ca6100fc0..f605cb815 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-30  Daiki Ueno  <ueno@gnu.org>
+
+	* x-c.c (literalstring_parse): Fix octal character escape handling.
+	Reported by Kjartan Maraas at:
+	<https://bugzilla.redhat.com/show_bug.cgi?id=1147535>.
+
 2014-09-24  Daiki Ueno  <ueno@gnu.org>
 
 	* x-python.c (x_python_lex): Move 'token3' variable declaration
diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c
index 479b8e8f6..a5978c9f6 100644
--- a/gettext-tools/src/x-c.c
+++ b/gettext-tools/src/x-c.c
@@ -996,7 +996,8 @@ literalstring_parse (const char *string, lex_pos_ty *pos,
               for (n = 0, j = 0; j < 3; ++j)
                 {
                   n = n * 8 + c - '0';
-                  switch (*++p)
+                  c = *++p;
+                  switch (c)
                     {
                     default:
                       break;