mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-21 03:13:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://github.com/Unidata/netcdf-c

Browse Source
This commit is contained in:
dmh 2014-04-16 14:08:52 -06:00
commit 5f297f2d2c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libsrc/v1hpg.c
View File

@ -1136,7 +1136,8 @@ NC_computeshapes(NC3_INFO* ncp)
if(first_rec != NULL)
{
assert(ncp->begin_rec <= first_rec->begin);
if(ncp->begin_rec > first_rec->begin)
return(NC_ENOTNC); /* not a netCDF file or corrupted */
ncp->begin_rec = first_rec->begin;
/*
* for special case of exactly one record variable, pack value
@ -1154,11 +1155,12 @@ NC_computeshapes(NC3_INFO* ncp)
ncp->begin_var = ncp->begin_rec;
}
assert(ncp->begin_var > 0);
assert(ncp->xsz <= (size_t)ncp->begin_var);
assert(ncp->begin_rec > 0);
assert(ncp->begin_var <= ncp->begin_rec);
if(ncp->begin_var <= 0 ||
ncp->xsz > (size_t)ncp->begin_var ||
ncp->begin_rec <= 0 ||
ncp->begin_var > ncp->begin_rec)
return(NC_ENOTNC); /* not a netCDF file or corrupted */
return(ENOERR);
}