Prevent segmentation faults in some places.

1 files changed, 9 insertions, 3 deletions

diff --git a/src/xml.c b/src/xml.c
index e677fe1..d34b0ac 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -126,9 +126,15 @@ xml_node_pop(XML_Parser p)
 	free(n);
 
 	n = (struct xml_node *) XML_GetUserData(p);
-	XML_SetStartElementHandler(p, n->start);
-	XML_SetEndElementHandler(p, n->end);
-	XML_SetCharacterDataHandler(p, n->charhndl);
+	if (n == NULL) {
+		XML_SetStartElementHandler(p, NULL);
+		XML_SetEndElementHandler(p, NULL);
+		XML_SetCharacterDataHandler(p, NULL);
+	} else {
+		XML_SetStartElementHandler(p, n->start);
+		XML_SetEndElementHandler(p, n->end);
+		XML_SetCharacterDataHandler(p, n->charhndl);
+	}
 
 	return data;
 }