X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_restore.c;h=1adf0747c34a7bcbd60c082e9d2268c5ae03f24c;hb=8bc9c72439dd9736612f39e5e794893b18b88498;hp=3246047ce8677fd1d9ea7f2ad098e4c611911003;hpb=291d201f087974f6e2b717aea983cf6c7b0d67e7;p=rrdtool.git

diff --git a/src/rrd_restore.c b/src/rrd_restore.c
index 3246047..1adf074 100644
--- a/src/rrd_restore.c
+++ b/src/rrd_restore.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.12  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.19  Copyright by Tobi Oetiker, 1997-2007
  *****************************************************************************
  * rrd_restore.c  creates new rrd from data dumped by rrd_dump.c
  *****************************************************************************/
@@ -18,6 +18,7 @@
 
 void xml_lc(char*);
 int skip(char **);
+int skipxml(char **);
 int eat_tag(char **, char *);
 int read_tag(char **, char *, char *, void *);
 int xml2rrd(char*, rrd_t*, char);
@@ -44,12 +45,32 @@ void xml_lc(char* buf){
   }
 }
 
-int skip(char **buf){
+int skipxml(char **buf){
   char *ptr;  
   ptr=(*buf);
   do {
     (*buf)=ptr;
     while((*(ptr+1)) && ((*ptr)==' ' ||  (*ptr)=='\r' || (*ptr)=='\n' || (*ptr)=='\t')) ptr++;
+    if (strncmp(ptr,"<?xml",4) == 0) {
+      ptr= strstr(ptr,"?>");
+      if (ptr) ptr+=2; else {
+	rrd_set_error("Dangling XML header");
+	(*buf) = NULL;
+	return -1;
+      }
+    }
+  } while ((*buf)!=ptr);  
+  return 1;
+}
+
+int skip(char **buf){
+  char *ptr;
+  if ((buf == NULL) || (*buf == NULL))
+    return -1;  
+  ptr=(*buf);
+  do {
+    (*buf)=ptr;
+    while((*(ptr+1)) && ((*ptr)==' ' ||  (*ptr)=='\r' || (*ptr)=='\n' || (*ptr)=='\t')) ptr++;
     if (strncmp(ptr,"<!--",4) == 0) {
       ptr= strstr(ptr,"-->");
       if (ptr) ptr+=3; else {
@@ -118,6 +139,8 @@ int xml2rrd(char* buf, rrd_t* rrd, char rc){
   ptr2=buf;
   ptr3=buf;
   /* start with an RRD tag */
+  
+  skipxml(&ptr);
 
   eat_tag(&ptr,"rrd");
   /* allocate static header */
@@ -130,10 +153,12 @@ int xml2rrd(char* buf, rrd_t* rrd, char rc){
   read_tag(&ptr,"version","%4[0-9]",rrd->stat_head->version);
   input_version = atoi(rrd->stat_head->version);
   /* added primitive version checking */
-  if (input_version > atoi(RRD_VERSION) )
+  if (input_version > atoi(RRD_VERSION) || input_version < 1)
   {
-    rrd_set_error("Incompatible file version, detected version %s is bigger than supported version %s\n",
+    rrd_set_error("Incompatible file version, detected version %s. This is not supported by the version %s restore tool.\n",
 		  rrd -> stat_head -> version, RRD_VERSION );
+    free(rrd -> stat_head); 
+    rrd->stat_head = NULL; 
     return -1;
   }
   /* make sure we output the right version */
@@ -189,8 +214,9 @@ int xml2rrd(char* buf, rrd_t* rrd, char rc){
       read_tag(&ptr2,"max","%lf",&(rrd->ds_def[rrd->stat_head->ds_cnt-1].par[DS_max_val].u_val));
 	  } else { /* DST_CDEF */
 		 char buffer[1024];
-	     read_tag(&ptr2,"cdef","%s",buffer);
+	         read_tag(&ptr2,"cdef","%1000s",buffer);
 		 parseCDEF_DS(buffer,rrd,rrd -> stat_head -> ds_cnt - 1);
+		 if (rrd_test_error()) return -1;
 	  }
 
       read_tag(&ptr2,"last_ds","%30s",rrd->pdp_prep[rrd->stat_head->ds_cnt-1].last_ds);
@@ -213,7 +239,7 @@ int xml2rrd(char* buf, rrd_t* rrd, char rc){
       if((rrd->cdp_prep = rrd_realloc(rrd->cdp_prep,
 				  rrd->stat_head->rra_cnt
 				  *rrd->stat_head->ds_cnt*sizeof(cdp_prep_t)))==NULL){
-	  rrd_set_error("allocating cdp_prep"); return -1; }
+         rrd_set_error("allocating cdp_prep"); return -1; }
 
       memset(&(rrd->cdp_prep[rrd->stat_head->ds_cnt*(rrd->stat_head->rra_cnt-1)]), 
 	     0, rrd->stat_head->ds_cnt*sizeof(cdp_prep_t));
@@ -230,7 +256,10 @@ int xml2rrd(char* buf, rrd_t* rrd, char rc){
          read_tag(&ptr2, "xff","%lf",
             &(rrd->rra_def[rra_index].par[RRA_cdp_xff_val].u_val));
       } else {
-        eat_tag(&ptr2, "params");
+        if (eat_tag(&ptr2, "params") != 1) {
+    	  rrd_set_error("could not find params tag to eat and skip");
+          return -1;
+        }
         skip(&ptr2);
         /* backwards compatibility w/ old patch */
       if (strncmp(ptr2, "<value>",7) == 0) {