X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_open.c;h=11476de43cb85bcec38ceb56cab7a42da86454c9;hb=9b54930dbbfe127febcd165e79f6019f822ec802;hp=d60a3b76020ae3f843a0a3eea5fe944d8d630b75;hpb=87617d608f152fd298bcace0d881c92b5538d65d;p=rrdtool.git diff --git a/src/rrd_open.c b/src/rrd_open.c index d60a3b7..11476de 100644 --- a/src/rrd_open.c +++ b/src/rrd_open.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.3 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 ... */