From 10d3084d16f4926bb3ba14222c19cfd01eb4ca8d Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 24 Sep 2009 13:08:30 +0200 Subject: [PATCH] Fix leaks for marchash_ingest_marcxml --- src/marchash.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) 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; } -- 1.7.10.4