From: Daiki Ueno <ueno@gnu.org>
Date: Wed, 24 Sep 2014 09:04:17 +0000 (+0900)
Subject: python: Fix invalid memory access when concatenating strings with +
X-Git-Tag: v0.19.2.1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56791441914c42f4166257f33694942631b1dc7e;p=thirdparty%2Fgettext.git

python: Fix invalid memory access when concatenating strings with +

* gettext-tools/src/x-python.c (x_python_lex): Move 'token3' variable
declaration out of the internal block.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index bd490dd42..ca6100fc0 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-24  Daiki Ueno  <ueno@gnu.org>
+
+	* x-python.c (x_python_lex): Move 'token3' variable declaration
+	out of the internal block.
+
 2014-09-24  Daiki Ueno  <ueno@gnu.org>
 
 	* filter-quote.c (BOLD_START, BOLD_END): Don't use non-portable
diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c
index 970006a99..d781ef2f4 100644
--- a/gettext-tools/src/x-python.c
+++ b/gettext-tools/src/x-python.c
@@ -1501,14 +1501,13 @@ x_python_lex (token_ty *tp)
       for (;;)
         {
           token_ty token2, *tp2 = NULL;
+          token_ty token3;
 
           phase5_get (&token2);
           switch (token2.type)
             {
             case token_type_plus:
               {
-                token_ty token3;
-
                 phase5_get (&token3);
                 if (token3.type == token_type_string)
                   {