From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 24 Sep 2009 11:08:30 +0000 (+0200)
Subject: Fix leaks for marchash_ingest_marcxml
X-Git-Tag: v1.2.1~15
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=10d3084d16f4926bb3ba14222c19cfd01eb4ca8d;p=pazpar2-moved-to-github.git

Fix leaks for marchash_ingest_marcxml
---

diff --git a/src/marchash.c b/src/marchash.c
index 58e8192..6376d1f 100644
--- a/src/marchash.c
+++ b/src/marchash.c
@@ -92,17 +92,23 @@ void marchash_ingest_marcxml(struct marchash *marchash, xmlNodePtr rec_node)
              field = NULL;
              if (!strcmp((const char *) field_node->name, "controlfield"))
              {
-                 field = marchash_add_field(
-                     marchash, 
-                     (const char *) xmlGetProp(field_node, BAD_CAST "tag"),
-                     (const char *) xmlNodeGetContent(field_node));
+                 xmlChar *content = xmlNodeGetContent(field_node);
+                 xmlChar *tag = xmlGetProp(field_node, BAD_CAST "tag");
+                 if (tag && content)
+                     field = marchash_add_field(
+                         marchash, (const char *) tag, (const char *) content);
+                 xmlFree(content);
+                 xmlFree(tag);
              }
              else if (!strcmp((const char *) field_node->name, "datafield"))
              {
-                 field = marchash_add_field(
-                     marchash,
-                     (const char *) xmlGetProp(field_node, BAD_CAST "tag"),
-                     (const char *) xmlNodeGetContent(field_node));
+                 xmlChar *content = xmlNodeGetContent(field_node);
+                 xmlChar *tag = xmlGetProp(field_node, BAD_CAST "tag");
+                 if (tag && content)
+                     field = marchash_add_field(
+                         marchash, (const char *) tag, (const char *) content);
+                 xmlFree(content);
+                 xmlFree(tag);
              }
              if (field)
              {
@@ -112,10 +118,14 @@ void marchash_ingest_marcxml(struct marchash *marchash, xmlNodePtr rec_node)
                      if ((sub_node->type == XML_ELEMENT_NODE) &&
                          !strcmp((const char *) sub_node->name, "subfield"))
                      {
-                         marchash_add_subfield(
-                             marchash, field,
-                             xmlGetProp(sub_node, BAD_CAST "code")[0],
-                             (const char *) xmlNodeGetContent(sub_node));
+                         xmlChar *content = xmlNodeGetContent(sub_node);
+                         xmlChar *code = xmlGetProp(sub_node, BAD_CAST "code");
+                         if (code && content)
+                             marchash_add_subfield(
+                                 marchash, field,
+                                 code[0], (const char *) content);
+                         xmlFree(content);
+                         xmlFree(code);
                      }
                      sub_node = sub_node->next;
                  }