summaryrefslogtreecommitdiffstats
path: root/gettext-tools
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2013-06-17 12:20:44 +0900
committerDaiki Ueno <ueno@gnu.org>2013-06-17 12:22:36 +0900
commit51d87a61197ef9c78b97de291535d0e005b6385c (patch)
tree54f16f1bad47b60d7de161385c4a34655f88c1dc /gettext-tools
parentf6b2f39db7ca32a52fda9ede6a59e8f0b1c72da4 (diff)
downloadexternal_gettext-51d87a61197ef9c78b97de291535d0e005b6385c.zip
external_gettext-51d87a61197ef9c78b97de291535d0e005b6385c.tar.gz
external_gettext-51d87a61197ef9c78b97de291535d0e005b6385c.tar.bz2
Make Glade parsing a bit robuster.
Diffstat (limited to 'gettext-tools')
-rw-r--r--gettext-tools/src/ChangeLog10
-rw-r--r--gettext-tools/src/x-glade.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 1cb64a3..45d639b 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 e607720..3d1ec42 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))
{