Make Glade parsing a bit robuster.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 1cb64a3731d5bcd3ecb827b17ab5465ee813fdcc..45d639b3d017fbd58672772f07708a82ea44a5bb 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,13 @@
+2013-06-17  Daiki Ueno  <ueno@gnu.org>
+
+       * x-glade.c (start_element_null): New function.
+       (end_element_null): New function.
+       (element_parser_null): New variable.
+       (start_element_handler): Use element_parser_null if the top-level
+       element does not indicate a valid Glade file.
+       (do_extract_glade): Initialize element_parser to
+       element_parser_null rather than NULL.
+
 2013-06-13  Miguel Angel Arruga Vivas  <rosen644835@gmail.com>
             Daiki Ueno  <ueno@gnu.org>
 

diff --git a/gettext-tools/src/x-glade.c b/gettext-tools/src/x-glade.c
index e607720a26674d4ce7fe045c8671f9d68402cbda..3d1ec4286b3e0a1435fe9c97c8e9117d259653da 100644 (file)
--- a/gettext-tools/src/x-glade.c
+++ b/gettext-tools/src/x-glade.c
@@ -821,7 +821,7 @@ do_extract_glade (FILE *fp,
   XML_SetCommentHandler (parser, comment_handler);
 
   stack_depth = 0;
-  element_parser = NULL;
+  element_parser = &element_parser_null;
 
   while (!feof (fp))
     {