From a4a4e6e2385586873a9e8f66479c5bb9ca011291 Mon Sep 17 00:00:00 2001 From: oetiker Date: Sat, 11 Jun 2005 19:03:46 +0000 Subject: [PATCH] be more careful when checking if a file is an rrdfile git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@632 a5681a0c-68f1-0310-ab6d-d61299d08faa --- program/src/rrd_open.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/program/src/rrd_open.c b/program/src/rrd_open.c index 11476de4..bf818e5d 100644 --- a/program/src/rrd_open.c +++ b/program/src/rrd_open.c @@ -112,7 +112,6 @@ rrd_open(const char *file_name, FILE **in_file, rrd_t *rrd, int rdwr) 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){ @@ -121,19 +120,22 @@ rrd_open(const char *file_name, FILE **in_file, rrd_t *rrd, int rdwr) 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); 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); 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 */ -- 2.30.2