X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=program%2Fsrc%2Frrd_open.c;h=11476de43cb85bcec38ceb56cab7a42da86454c9;hb=fc9c087961677fc0ceacfb4f0465207ec0dd2df3;hp=a411ddf03dea4399687e2be8abf314686b1ea695;hpb=012106294392f24e3fec3c7e4b7bc3f8634ad9e3;p=rrdtool-all.git

diff --git a/program/src/rrd_open.c b/program/src/rrd_open.c
index a411ddf0..11476de4 100644
--- a/program/src/rrd_open.c
+++ b/program/src/rrd_open.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.0  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.9  Copyright by Tobi Oetiker, 1997-2005
  *****************************************************************************
  * rrd_open.c  Open an RRD File
  *****************************************************************************
@@ -101,11 +101,17 @@ rrd_open(const char *file_name, FILE **in_file, rrd_t *rrd, int rdwr)
     if ((MYVAR = malloc(sizeof(MYVART) * MYCNT)) == NULL) {\
 	rrd_set_error("" #MYVAR " malloc"); \
         fclose(*in_file); \
-    return (-1); } \
+        return (-1); } \
     fread(MYVAR,sizeof(MYVART),MYCNT, *in_file); 
 
 
     MYFREAD(rrd->stat_head, stat_head_t,  1)
+    /* lets see if the first read worked */
+    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 ... */