From 9b3234a067cd5031bd56354f9ca1f7f549d1b2ae Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Wed, 23 May 2012 21:06:19 -0700
Subject: [PATCH] fix the xmlreader to not assert on invalid data

---
 src/kernel/xmlreader.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/kernel/xmlreader.c b/src/kernel/xmlreader.c
index d8fdfd1e7..3f7422488 100644
--- a/src/kernel/xmlreader.c
+++ b/src/kernel/xmlreader.c
@@ -1481,9 +1481,13 @@ static int parse_spellbooks(xmlDocPtr doc)
       spellbook * sb;
       
       propValue = xmlGetProp(node, BAD_CAST "name");
-      assert(propValue != NULL);
-      sb = get_spellbook((const char *)propValue);
-      xmlFree(propValue);
+      if (propValue) {
+        sb = get_spellbook((const char *)propValue);
+        xmlFree(propValue);
+      } else {
+        log_error("spellbook at index '%d' has n name\n", i);
+        continue;
+      }
 
       xpath->node = node;
       result = xmlXPathEvalExpression(BAD_CAST "entry", xpath);
@@ -1494,7 +1498,7 @@ static int parse_spellbooks(xmlDocPtr doc)
           spell * sp = 0;
           int level = xml_ivalue(node, "level", -1);
 
-          propValue = xmlGetProp(node, BAD_CAST "name");
+          propValue = xmlGetProp(node, BAD_CAST "spell");
           if (propValue) {
             sp = find_spell((const char *)propValue);
             xmlFree(propValue);