X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_open.c;h=6be18466a0f096ab87cb8fcfcf500e3d0fcc24a5;hb=3882bb0c2d15f97298aaa7602d6353a1888f5547;hp=6f7def14b3d6fd0347dad03d4995985362ba708a;hpb=361a0fd38d7adf95847508f54c0bde9b3f98662e;p=rrdtool.git

diff --git a/src/rrd_open.c b/src/rrd_open.c
index 6f7def1..6be1846 100644
--- a/src/rrd_open.c
+++ b/src/rrd_open.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.8  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.16  Copyright by Tobi Oetiker, 1997-2006
  *****************************************************************************
  * rrd_open.c  Open an RRD File
  *****************************************************************************
@@ -107,33 +107,38 @@ rrd_open(const char *file_name, FILE **in_file, rrd_t *rrd, int rdwr)
 
     MYFREAD(rrd->stat_head, stat_head_t,  1)
     /* lets see if the first read worked */
-    if (ferror( *in_file )){
+    if (ferror( *in_file ) || feof(*in_file)) {
 	rrd_set_error("reading the cookie off %s faild",file_name);
 	fclose(*in_file);
 	return(-1);
     }	
-    version = atoi(rrd->stat_head->version);
 
 	/* lets do some test if we are on track ... */
 	if (strncmp(rrd->stat_head->cookie,RRD_COOKIE,4) != 0){
 	    rrd_set_error("'%s' is not an RRD file",file_name);
 	    free(rrd->stat_head);
+            rrd->stat_head = NULL; 
 	    fclose(*in_file);
 	    return(-1);}
 
-        if (version > atoi(RRD_VERSION)){
-	    rrd_set_error("can't handle RRD file version %s",
-			rrd->stat_head->version);
+	if (rrd->stat_head->float_cookie != FLOAT_COOKIE){
+	    rrd_set_error("This RRD was created on other architecture");
 	    free(rrd->stat_head);
+            rrd->stat_head = NULL; 
 	    fclose(*in_file);
 	    return(-1);}
 
-	if (rrd->stat_head->float_cookie != FLOAT_COOKIE){
-	    rrd_set_error("This RRD was created on other architecture");
+    version = atoi(rrd->stat_head->version);
+
+        if (version > atoi(RRD_VERSION)){
+	    rrd_set_error("can't handle RRD file version %s",
+			rrd->stat_head->version);
 	    free(rrd->stat_head);
+            rrd->stat_head = NULL; 
 	    fclose(*in_file);
 	    return(-1);}
 
+
     MYFREAD(rrd->ds_def,    ds_def_t,     rrd->stat_head->ds_cnt)
     MYFREAD(rrd->rra_def,   rra_def_t,    rrd->stat_head->rra_cnt)
     /* handle different format for the live_head */