[almanah] core: Make the XML parser slightly more robust

[Philip Withnall <pwithnall src gnome org>]

commit a76942bdfee913ef606879f6998c219877ce14be
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Apr 18 17:23:03 2011 +0100

    core: Make the XML parser slightly more robust

 src/entry.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/entry.c b/src/entry.c
index 5f7d8c5..4ff1fed 100644
--- a/src/entry.c
+++ b/src/entry.c
@@ -670,7 +670,7 @@ start_element_cb (GMarkupParseContext *parse_context, const gchar *element_name,
 			/* Just retrieve the predefined tag from the tag table */
 			tag = gtk_text_tag_table_lookup (table, element_name);
 		} else if (strcmp (element_name, "link") == 0) {
-			guint i;
+			guint i = 0;
 			const gchar *uri;
 
 			/* Extract the URI */
@@ -715,6 +715,7 @@ end_element_cb (GMarkupParseContext *parse_context, const gchar *element_name, g
 		    strcmp (element_name, "underline") == 0 ||
 		    strcmp (element_name, "link") == 0) {
 			/* Pop the topmost tag off the active tags stack */
+			g_assert (deserialise_context->active_tags != NULL);
 			deserialise_context->active_tags = g_slist_remove (deserialise_context->active_tags, deserialise_context->active_tags->data);
 		}