yaz-marcdump: fix leaks for MARCXML parsing YAZ-694

[yaz-moved-to-github.git] / util / yaz-xmlquery.c

diff --git a/util/yaz-xmlquery.c b/util/yaz-xmlquery.c
index 4cc8196..34fefd2 100644 (file)
--- a/util/yaz-xmlquery.c
+++ b/util/yaz-xmlquery.c
@@ -1,9 +1,10 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
- *
- * $Id: yaz-xmlquery.c,v 1.8 2007-03-19 22:17:41 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -51,9 +52,9 @@ void pqftoxmlquery(const char *pqf)
     else
     {
        xmlDocPtr doc = 0;
-       
+
         yaz_rpnquery2xml(rpn, &doc);
-        
+
         if (!doc)
        {
            fprintf(stderr, "%s: yaz_rpnquery2xml failed for query %s\n",
@@ -74,10 +75,16 @@ void pqftoxmlquery(const char *pqf)
                exit(4);
            }
            else
-               fwrite(buf_out, len_out, 1, stdout);
+           {
+               if (fwrite(buf_out, len_out, 1, stdout) != 1)
+               {
+                   fprintf(stderr, "%s: write failed\n", prog);
+                   exit(5);
+               }
+           }
             xmlFreeDoc(doc);
        }
-    }    
+    }
     odr_destroy(odr);
 }
 
@@ -143,11 +150,19 @@ void xmlfiletopqf(const char *xmlfile)
        exit(1);
     }
     rewind(f);
-    xmlstr = xmalloc(sz+1);
+    xmlstr = (char *) xmalloc(sz+1);
     xmlstr[sz] = '\0';
-    fread(xmlstr, sz, 1, f);
-    fclose(f);
-    
+    if (fread(xmlstr, sz, 1, f) != 1)
+    {
+       fprintf(stderr, "%s: read failed for file %s\n", prog, xmlfile);
+       exit(1);
+    }
+    if (fclose(f))
+    {
+       fprintf(stderr, "%s: close failed for file %s\n", prog, xmlfile);
+       exit(1);
+    }
+
     xmlquerytopqf(xmlstr);
     xfree(xmlstr);
 }