X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_open.c;h=02c02703d6f8282768400192e5b9e9e60ed84424;hb=9e6db622e8756105c1322481b34650ecbe15da1a;hp=2b0f30391d35fad220ca1e91b9190add9422a86a;hpb=0dc5d6d50c0d95ba4f04b656358b26518d4ce854;p=rrdtool.git

diff --git a/src/rrd_open.c b/src/rrd_open.c
index 2b0f303..02c0270 100644
--- a/src/rrd_open.c
+++ b/src/rrd_open.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.9  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.14  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 */