mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2024-11-27 07:30:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

reset to original ncp->begin_var, instead of 0

Browse Source
This commit is contained in:
Wei-keng Liao 2017-09-08 02:18:00 -05:00
parent 2f239d34df
commit 680a6edd29
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libsrc/nc3internal.c
View File

@ -155,6 +155,7 @@ NC_begins(NC3_INFO* ncp,
size_t ii, j; size_t ii, j;
int sizeof_off_t; int sizeof_off_t;
off_t index = 0; off_t index = 0;
off_t old_ncp_begin_var;
NC_var **vpp; NC_var **vpp;
NC_var *last = NULL; NC_var *last = NULL;
NC_var *first_var = NULL; /* first "non-record" var */ NC_var *first_var = NULL; /* first "non-record" var */
@ -176,6 +177,8 @@ NC_begins(NC3_INFO* ncp,
if(ncp->vars.nelems == 0) if(ncp->vars.nelems == 0)
return NC_NOERR; return NC_NOERR;
old_ncp_begin_var = ncp->begin_var;
/* only (re)calculate begin_var if there is not sufficient space in header /* only (re)calculate begin_var if there is not sufficient space in header
or start of non-record variables is not aligned as requested by valign */ or start of non-record variables is not aligned as requested by valign */
if (ncp->begin_var < ncp->xsz + h_minfree || if (ncp->begin_var < ncp->xsz + h_minfree ||
@ -214,7 +217,7 @@ fprintf(stderr, " VAR %d %s: %ld\n", ii, (*vpp)->name->cp, (long)index);
#endif #endif
if( sizeof_off_t == 4 && (index > X_OFF_MAX || index < 0) ) if( sizeof_off_t == 4 && (index > X_OFF_MAX || index < 0) )
{ {
ncp->begin_var = 0; ncp->begin_var = old_ncp_begin_var;
return NC_EVARSIZE; return NC_EVARSIZE;
} }
(*vpp)->begin = index; (*vpp)->begin = index;
@ -285,7 +288,7 @@ fprintf(stderr, " REC %d %s: %ld\n", ii, (*vpp)->name->cp, (long)index);
#endif #endif
if( sizeof_off_t == 4 && (index > X_OFF_MAX || index < 0) ) if( sizeof_off_t == 4 && (index > X_OFF_MAX || index < 0) )
{ {
ncp->begin_var = 0; ncp->begin_var = old_ncp_begin_var;
return NC_EVARSIZE; return NC_EVARSIZE;
} }
(*vpp)->begin = index; (*vpp)->begin = index;
@ -308,7 +311,7 @@ fprintf(stderr, " REC %d %s: %ld\n", ii, (*vpp)->name->cp, (long)index);
#if SIZEOF_OFF_T == SIZEOF_SIZE_T && SIZEOF_SIZE_T == 4 #if SIZEOF_OFF_T == SIZEOF_SIZE_T && SIZEOF_SIZE_T == 4
if( ncp->recsize > X_UINT_MAX - (*vpp)->len ) if( ncp->recsize > X_UINT_MAX - (*vpp)->len )
{ {
ncp->begin_var = 0; ncp->begin_var = old_ncp_begin_var;
return NC_EVARSIZE; return NC_EVARSIZE;
} }
#endif #endif