From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Tue, 11 Aug 2009 14:00:57 +0000 (+0000)
Subject: fix freeing order when generating error messages. found by Dmitry V. Krivenok
X-Git-Url: https://git.tokkee.org/?p=rrdtool-all.git;a=commitdiff_plain;h=fc24d5bacdb0d0b93b10ac4eea6832df21a25b4e

fix freeing order when generating error messages. found by Dmitry V. Krivenok


git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.3@1889 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/program/src/rrd_restore.c b/program/src/rrd_restore.c
index 6acfa4e0..c5cbcd2d 100644
--- a/program/src/rrd_restore.c
+++ b/program/src/rrd_restore.c
@@ -108,14 +108,14 @@ static int get_long_from_node(
 
     end_ptr = NULL;
     temp = strtol(str_ptr, &end_ptr, 0);
-    xmlFree(str_ptr);
 
     if (str_ptr == end_ptr) {
         rrd_set_error("get_long_from_node: Cannot parse buffer as long: %s",
                       str_ptr);
+        xmlFree(str_ptr);
         return (-1);
     }
-
+    xmlFree(str_ptr);
     *value = temp;
 
     return (0);
@@ -138,14 +138,15 @@ static int get_ulong_from_node(
 
     end_ptr = NULL;
     temp = strtoul(str_ptr, &end_ptr, 0);
-    xmlFree(str_ptr);
 
     if (str_ptr == end_ptr) {
         rrd_set_error("get_ulong_from_node: Cannot parse buffer as unsigned long: %s",
                       str_ptr);
+        xmlFree(str_ptr);
         return (-1);
     }
-
+ 
+    xmlFree(str_ptr);
     *value = temp;
 
     return (0);
@@ -178,14 +179,14 @@ static int get_llong_from_node(
 
     end_ptr = NULL;
     temp = strtoll(str_ptr, &end_ptr, 10);
-    xmlFree(str_ptr);
 
     if (str_ptr == end_ptr) {
         rrd_set_error("get_llong_from_node: Cannot parse buffer as unsigned long long: %s",
                       str_ptr);
+        xmlFree(str_ptr);
         return (-1);
     }
-
+    xmlFree(str_ptr);
     *value = temp;
 
     return (0);
@@ -215,15 +216,15 @@ static int get_double_from_node(
 
     end_ptr = NULL;
     temp = strtod(str_ptr, &end_ptr);
-    xmlFree(str_ptr);
 
     if (str_ptr == end_ptr) {
         rrd_set_error
             ("get_double_from_node: Cannot parse buffer as double: %s",
              str_ptr);
+        xmlFree(str_ptr);
         return (-1);
     }
-
+    xmlFree(str_ptr);           
     *value = temp;
 
     return (0);