lua: fix crash when parsing '..' with non-string argument

Reported by Koen Dergent at <http://savannah.gnu.org/bugs/?39458>.
* x-lua.c (extract_balanced): Skip stray '..'.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 5077d86fd06968090fed0546d6e03329f979cb13..430e0faff239f98c6ccbd994254d11e08993d7a5 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-07-11  Daiki Ueno  <ueno@gnu.org>
+
+       Fix crash when parsing '..' with non-string argument.
+       Reported by Koen Dergent at <http://savannah.gnu.org/bugs/?39458>.
+       * x-lua.c (extract_balanced): Skip stray '..'.
+
 2013-06-27  Daiki Ueno  <ueno@gnu.org>
 
        * x-python.c (phase5_pushback): Increment size to 2.

diff --git a/gettext-tools/src/x-lua.c b/gettext-tools/src/x-lua.c
index 7a21258111c315f9c45225d8ac83754086d1484c..9fcc20d52a90c1772d9cbb6711d693b46dd3f1c0 100644 (file)
--- a/gettext-tools/src/x-lua.c
+++ b/gettext-tools/src/x-lua.c
@@ -1166,6 +1166,7 @@ extract_balanced (message_list_ty *mlp, token_type_ty delim,
           continue;
 
         case token_type_dot:
+        case token_type_doubledot:
         case token_type_operator1:
         case token_type_operator2:
         case token_type_number:

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index f5dba31fb7f6b2fc493d4b15593e3e9123ec2eaf..e342d7fbdbb58300bf5e3eae60108bfb6c6d0639 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,15 @@
+2013-07-11  Daiki Ueno  <ueno@gnu.org>
+
+       * xgettext-lua-1: Add test case for string concatenation.
+
+2013-07-10  Daiki Ueno  <ueno@gnu.org>
+
+       gettext-tools: convert tests to use init.sh from Gnulib
+       * Makefile.am (TESTS_ENVIRONMENT): Don't define LIBTOOL envvar
+       since it contains a relative path which cannot easily modified by
+       init.sh-using tests.  Set it in the tests instead.
+       * *: convert to use init.sh.
+
 2013-07-07  Daiki Ueno  <ueno@gnu.org>
 
        * lang-javascript: Fix gjs module checks.

diff --git a/gettext-tools/tests/xgettext-lua-1 b/gettext-tools/tests/xgettext-lua-1
index bad25b46178aee2dc7293575b97a8adbc29c97da..b2233ab5ba34803404204b5117f9635abb3a3da7 100755 (executable)
--- a/gettext-tools/tests/xgettext-lua-1
+++ b/gettext-tools/tests/xgettext-lua-1
@@ -21,6 +21,8 @@ print(_["nope"])
 print(_("\097"))
 print(_("\x3F\z        
 \x2a"))
+print(_("abc" .. "def"))
+print(speed / 1000 .. 'Mbps')
 EOF
 
 tmpfiles="$tmpfiles xg-lu-1.tmp.po xg-lu-1.po"
@@ -65,6 +67,9 @@ msgstr ""
 
 msgid "?*"
 msgstr ""
+
+msgid "abcdef"
+msgstr ""
 EOF
 
 : ${DIFF=diff}