Fix crash on some valid input.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 195b130a9befe3d53f6146f22b02c0beaca8ad51..9c7796927d41934e9af1cb9ef1410a3eaa92f79c 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-28  Bruno Haible  <bruno@clisp.org>
+
+       * x-scheme.c (read_object): Don't call arglist_parser_remember if
+       argparser is NULL.
+       * x-elisp.c (read_object): Likewise.
+       * x-librep.c (read_object): Likewise.
+       Reported by Kevin Ryde <user42@zip.com.au>.
+
 2006-08-16  Bruno Haible  <bruno@clisp.org>
 
        * plural-table.c (plural_table): Put Hungarian under nplurals=2.

diff --git a/gettext-tools/src/x-elisp.c b/gettext-tools/src/x-elisp.c
index df00643fa7d63010eb6521cdb0821494c1a5a38b..43f71805f33aa2ac08433253a7dd80b767c33141 100644 (file)
--- a/gettext-tools/src/x-elisp.c
+++ b/gettext-tools/src/x-elisp.c
@@ -709,7 +709,7 @@ read_object (struct object *op, bool first_in_list, bool new_backquote_flag,
                else
                  {
                    /* These are the argument positions.  */
-                   if (inner.type == t_string)
+                   if (argparser != NULL && inner.type == t_string)
                      arglist_parser_remember (argparser, arg,
                                               string_of_object (&inner),
                                               inner_context,

diff --git a/gettext-tools/src/x-librep.c b/gettext-tools/src/x-librep.c
index 6705ced3c6c404d838c3e6a088eaf44027aa6457..816151658b5a38c49f5bc05f99a239e521e56809 100644 (file)
--- a/gettext-tools/src/x-librep.c
+++ b/gettext-tools/src/x-librep.c
@@ -683,7 +683,7 @@ read_object (struct object *op, flag_context_ty outer_context)
                else
                  {
                    /* These are the argument positions.  */
-                   if (inner.type == t_string)
+                   if (argparser != NULL && inner.type == t_string)
                      arglist_parser_remember (argparser, arg,
                                               string_of_object (&inner),
                                               inner_context,

diff --git a/gettext-tools/src/x-scheme.c b/gettext-tools/src/x-scheme.c
index 9b33efba0e2523a1ce68c455dee079f0efb4f546..950463c3468e66d7bcb65576e56401c0c73c073b 100644 (file)
--- a/gettext-tools/src/x-scheme.c
+++ b/gettext-tools/src/x-scheme.c
@@ -794,7 +794,7 @@ read_object (struct object *op, flag_context_ty outer_context)
                else
                  {
                    /* These are the argument positions.  */
-                   if (inner.type == t_string)
+                   if (argparser != NULL && inner.type == t_string)
                      arglist_parser_remember (argparser, arg,
                                               string_of_object (&inner),
                                               inner_context,