From: Daiki Ueno <ueno@gnu.org>
Date: Mon, 17 Jun 2013 03:20:44 +0000 (+0900)
Subject: Make Glade parsing a bit robuster.
X-Git-Tag: v0.18.3~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51d87a61197ef9c78b97de291535d0e005b6385c;p=thirdparty%2Fgettext.git

Make Glade parsing a bit robuster.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 1cb64a373..45d639b3d 100644
--- 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 e607720a2..3d1ec4286 100644
--- 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))
     {