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

[rrdtool.git] / src / rrd_restore.c

diff --git a/src/rrd_restore.c b/src/rrd_restore.c
index 52c738b..46a79b5 100644 (file)
--- a/src/rrd_restore.c
+++ b/src/rrd_restore.c
@@ -241,6 +241,7 @@ static int get_xml_ulong(
     return -1;
 } /* get_xml_ulong */
 
     return -1;
 } /* get_xml_ulong */
 

+#ifndef TIME_T_IS_LONG

 static int get_xml_llong(
     xmlTextReaderPtr reader,
     long long *value)
 static int get_xml_llong(
     xmlTextReaderPtr reader,
     long long *value)


@@ -265,6 +266,8 @@ static int get_xml_llong(
     return -1;
 } /* get_xml_llong */
 
     return -1;
 } /* get_xml_llong */
 

+#endif
+

 static int get_xml_double(
     xmlTextReaderPtr reader,
     double *value)
 static int get_xml_double(
     xmlTextReaderPtr reader,
     double *value)


@@ -291,13 +294,14 @@ static int get_xml_double(
         }        
         errno = 0;
         temp = strtod((char *)text,NULL);
         }        
         errno = 0;
         temp = strtod((char *)text,NULL);

-        xmlFree(text);        

         if (errno>0){
             rrd_set_error("ling %d: get_xml_double from '%s' %s",
                           xmlTextReaderGetParserLineNumber(reader),
                           text,rrd_strerror(errno));
         if (errno>0){
             rrd_set_error("ling %d: get_xml_double from '%s' %s",
                           xmlTextReaderGetParserLineNumber(reader),
                           text,rrd_strerror(errno));

+            xmlFree(text);        

             return -1;
         }
             return -1;
         }

+        xmlFree(text);        

         *value = temp;
         return 0;
     }
         *value = temp;
         return 0;
     }


@@ -1011,6 +1015,12 @@ static int parse_tag_rrd(
             status = get_xml_ulong(reader,
                                         &rrd->stat_head->pdp_step);
         else if (xmlStrcasecmp(element, (const xmlChar *) "lastupdate") == 0) {
             status = get_xml_ulong(reader,
                                         &rrd->stat_head->pdp_step);
         else if (xmlStrcasecmp(element, (const xmlChar *) "lastupdate") == 0) {

+#ifdef TIME_T_IS_LONG
+                status = get_xml_long(reader, &rrd->live_head->last_up);
+#else
+#ifdef TIME_T_IS_LONG_LONG
+                status = get_xml_llong(reader, &rrd->live_head->last_up); 
+#else

             if (sizeof(time_t) == sizeof(long)) {
                 status = get_xml_long(reader,
                                         (long *)&rrd->live_head->last_up);
             if (sizeof(time_t) == sizeof(long)) {
                 status = get_xml_long(reader,
                                         (long *)&rrd->live_head->last_up);


@@ -1019,6 +1029,8 @@ static int parse_tag_rrd(
                 status = get_xml_llong(reader,
                                         (long long *)&rrd->live_head->last_up); 
             }
                 status = get_xml_llong(reader,
                                         (long long *)&rrd->live_head->last_up); 
             }

+#endif
+#endif

         }
         else if (xmlStrcasecmp(element, (const xmlChar *) "ds") == 0){            
             xmlFree(element);
         }
         else if (xmlStrcasecmp(element, (const xmlChar *) "ds") == 0){            
             xmlFree(element);