Fix 0 ptr reference for OPAC records from XML YAZ-822

[yaz-moved-to-github.git] / src / xml_match.c

diff --git a/src/xml_match.c b/src/xml_match.c
index ab0e4b1..7dddb6f 100644 (file)
--- a/src/xml_match.c
+++ b/src/xml_match.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -10,18 +10,14 @@
 #include <config.h>
 #endif
 
-#include <stdlib.h>
-
 #include <yaz/srw.h>
-#include <yaz/wrbuf.h>
 #if YAZ_HAVE_XML2
-#include <libxml/parser.h>
-#include <libxml/tree.h>
 #include "sru-p.h"
 
 int yaz_match_xsd_element(xmlNodePtr ptr, const char *elem)
 {
-    if (ptr->type == XML_ELEMENT_NODE && !xmlStrcmp(ptr->name, BAD_CAST elem))
+    if (ptr && ptr->type == XML_ELEMENT_NODE &&
+        !xmlStrcmp(ptr->name, BAD_CAST elem))
     {
         return 1;
     }
@@ -30,8 +26,8 @@ int yaz_match_xsd_element(xmlNodePtr ptr, const char *elem)
 
 #define CHECK_TYPE 0
 
-int yaz_match_xsd_string_n(xmlNodePtr ptr, const char *elem, ODR o,
-                           char **val, int *len)
+int yaz_match_xsd_string_n_nmem(xmlNodePtr ptr, const char *elem, NMEM nmem,
+                                char **val, int *len)
 {
 #if CHECK_TYPE
     struct _xmlAttr *attr;
@@ -60,12 +56,17 @@ int yaz_match_xsd_string_n(xmlNodePtr ptr, const char *elem, ODR o,
         *val = "";
         return 1;
     }
-    *val = odr_strdup(o, (const char *) ptr->content);
+    *val = nmem_strdup(nmem, (const char *) ptr->content);
     if (len)
         *len = xmlStrlen(ptr->content);
     return 1;
 }
 
+int yaz_match_xsd_string_n(xmlNodePtr ptr, const char *elem, ODR o,
+                           char **val, int *len)
+{
+    return yaz_match_xsd_string_n_nmem(ptr, elem, o->mem, val, len);
+}
 
 int yaz_match_xsd_string(xmlNodePtr ptr, const char *elem, ODR o, char **val)
 {
@@ -107,10 +108,7 @@ int yaz_match_xsd_XML_n2(xmlNodePtr ptr, const char *elem, ODR o,
         xmlBufferAddHead(buf, (const xmlChar *) "<yaz_record>", -1);
         xmlBufferAdd(buf, (const xmlChar *) "</yaz_record>", -1);
     }
-    *val = (char *) odr_malloc(o, buf->use + 1);
-    memcpy(*val, buf->content, buf->use);
-    (*val)[buf->use] = '\0';
-
+    *val = odr_strdupn(o, (const char *) buf->content, buf->use);
     if (len)
         *len = buf->use;