From 51d87a61197ef9c78b97de291535d0e005b6385c Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 17 Jun 2013 12:20:44 +0900 Subject: [PATCH] Make Glade parsing a bit robuster. --- gettext-tools/src/ChangeLog | 10 ++++++++++ gettext-tools/src/x-glade.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) 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 + + * 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 Daiki Ueno 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)) { -- 2.47.2