mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-04-06 18:00:24 +08:00
More changes towards fixing the issue where the file is read incorrectly.
This commit is contained in:
Ward Fisher
parent
7a417b9c37
commit
bd92caa176
41
gdb.txt
41
gdb.txt
@ -1,29 +1,28 @@
|
||||
break test_nc_put_var1
|
||||
commands
|
||||
break util.c:960 if var_name[i][0] == 'c' && var_name[i][1] == 'r' && var_name[i][2] == '\0' && i == 6 && j == 1
|
||||
|
||||
break util.c:960 if i == 6 && j == 0
|
||||
commands
|
||||
|
||||
break ncio_get
|
||||
commands
|
||||
break posixio.c:691
|
||||
commands
|
||||
print diff
|
||||
print ((char*)pxp->bf_base + diff)[0]
|
||||
print ((signed char*)pxp->bf_base + diff)[0]
|
||||
end
|
||||
|
||||
end
|
||||
break test_put.c:3330 if var_name[i][0] == 'c' && var_name[i][1] == 'r' && var_name[i][2] == '\0'
|
||||
break test_write.c:737 if var_name[i][0] == 'c' && var_name[i][1] == 'r' && var_name[i][2] == '\0'
|
||||
|
||||
|
||||
continue
|
||||
end
|
||||
#break util.c:960 if i == 6 && j == 0
|
||||
#commands
|
||||
#break nc_get_var_text
|
||||
#break ncio_get
|
||||
#commands
|
||||
#break posixio.c:691
|
||||
#commands
|
||||
#print diff
|
||||
#print ((char*)pxp->bf_base + diff)[0]
|
||||
#print ((signed char*)pxp->bf_base + diff)[0]
|
||||
#end
|
||||
|
||||
continue
|
||||
end
|
||||
#end
|
||||
|
||||
break util.c:963 if text != expect && i == 6 && j == 0
|
||||
break util.c:964
|
||||
#continue
|
||||
#end
|
||||
|
||||
#break util.c:963 if text != expect && i == 6 && j == 0
|
||||
#break util.c:964
|
||||
|
||||
###
|
||||
|
||||
|
||||
18
include/nc.h
18
include/nc.h
@ -19,7 +19,7 @@
|
||||
* netcdf-4 files. The ext_ncid contains the ncid for the root
|
||||
* group (i.e. group zero). */
|
||||
|
||||
/* Common Shared Structure for all Dispatched Objects */
|
||||
/* Common Shared Structure for all Dispatched Objects */
|
||||
typedef struct NC {
|
||||
int ext_ncid;
|
||||
int int_ncid;
|
||||
@ -39,7 +39,12 @@ typedef struct NC {
|
||||
typedef struct {
|
||||
/* all xdr'd */
|
||||
size_t nchars;
|
||||
char *cp;
|
||||
#ifdef __arm__
|
||||
signed char *cp;
|
||||
#else
|
||||
char *cp;
|
||||
#endif
|
||||
|
||||
} NC_string;
|
||||
|
||||
/* Define functions that are used across multiple dispatchers */
|
||||
@ -51,11 +56,18 @@ free_NC_string(NC_string *ncstrp);
|
||||
extern int
|
||||
NC_check_name(const char *name);
|
||||
|
||||
#ifdef __arm__
|
||||
extern NC_string *
|
||||
new_NC_string(size_t slen, const signed char *str);
|
||||
extern int
|
||||
set_NC_string(NC_string *ncstrp, const signed char *str);
|
||||
#else
|
||||
extern NC_string *
|
||||
new_NC_string(size_t slen, const char *str);
|
||||
|
||||
extern int
|
||||
set_NC_string(NC_string *ncstrp, const char *str);
|
||||
#endif
|
||||
|
||||
|
||||
/* End defined in string.c */
|
||||
|
||||
|
||||
@ -35,7 +35,7 @@ free_NC_string(NC_string *ncstrp)
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
static int
|
||||
nextUTF8(const char* cp)
|
||||
{
|
||||
/* The goal here is to recognize the length of each
|
||||
@ -54,15 +54,15 @@ nextUTF8(const char* cp)
|
||||
| (\xF0[\x90-\xBF][\x80-\xBF][\x80-\xBF]) \
|
||||
| ([\xF1-\xF3][\x80-\xBF][\x80-\xBF][\x80-\xBF]) \
|
||||
| (\xF4[\x80-\x8F][\x80-\xBF][\x80-\xBF]) \
|
||||
|
||||
|
||||
2. partially relaxed:
|
||||
UTF8 ([\xC0-\xDF][\x80-\xBF])
|
||||
|([\xE0-\xEF][\x80-\xBF][\x80-\xBF])
|
||||
|([\xF0-\xF7][\x80-\xBF][\x80-\xBF][\x80-\xBF])
|
||||
|
||||
|
||||
3. The most relaxed version of UTF8:
|
||||
UTF8 ([\xC0-\xD6].)|([\xE0-\xEF]..)|([\xF0-\xF7]...)
|
||||
|
||||
|
||||
We use #2 here.
|
||||
|
||||
The tests are derived from the table at
|
||||
@ -72,7 +72,7 @@ nextUTF8(const char* cp)
|
||||
/* Define a test macro to test against a range */
|
||||
#define RANGE(c,lo,hi) (((uchar)c) >= lo && ((uchar)c) <= hi)
|
||||
/* Define a common RANGE */
|
||||
#define RANGE0(c) RANGE(c,0x80,0xBF)
|
||||
#define RANGE0(c) RANGE(c,0x80,0xBF)
|
||||
|
||||
int ch0;
|
||||
|
||||
@ -124,7 +124,7 @@ nextUTF8(const char* cp)
|
||||
int ch3 = (uchar)cp[3];
|
||||
if(ch3 != 0 && RANGE0(ch3)) skip = 4;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if((ch0 == 0xF4)) {/* plane 16 */
|
||||
int ch1 = (uchar)cp[1];
|
||||
if(ch1 != 0 && RANGE0(ch1)) {
|
||||
@ -133,7 +133,7 @@ nextUTF8(const char* cp)
|
||||
int ch3 = (uchar)cp[3];
|
||||
if(ch3 != 0 && RANGE0(ch3)) skip = 4;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if(RANGE(ch0,0xF1,0xF3) { /* planes 4-15 */
|
||||
int ch1 = (uchar)cp[1];
|
||||
if(ch1 != 0 && RANGE0(ch1)) {
|
||||
@ -178,7 +178,7 @@ NC_check_name(const char *name)
|
||||
if(*name == 0 /* empty names disallowed */
|
||||
|| strchr(cp, '/')) /* '/' can't be in a name */
|
||||
goto fail;
|
||||
|
||||
|
||||
/* check validity of any UTF-8 */
|
||||
utf8_stat = utf8proc_check((const unsigned char *)name);
|
||||
if (utf8_stat < 0)
|
||||
@ -186,15 +186,15 @@ NC_check_name(const char *name)
|
||||
|
||||
/* First char must be [a-z][A-Z][0-9]_ | UTF8 */
|
||||
ch = (uchar)*cp;
|
||||
if(ch <= 0x7f) {
|
||||
if( !('A' <= ch && ch <= 'Z')
|
||||
&& !('a' <= ch && ch <= 'z')
|
||||
if(ch <= 0x7f) {
|
||||
if( !('A' <= ch && ch <= 'Z')
|
||||
&& !('a' <= ch && ch <= 'z')
|
||||
&& !('0' <= ch && ch <= '9')
|
||||
&& ch != '_' )
|
||||
goto fail;
|
||||
cp++;
|
||||
} else {
|
||||
if((skip = nextUTF8(cp)) < 0)
|
||||
if((skip = nextUTF8(cp)) < 0)
|
||||
goto fail;
|
||||
cp += skip;
|
||||
}
|
||||
@ -202,7 +202,7 @@ NC_check_name(const char *name)
|
||||
while(*cp != 0) {
|
||||
ch = (uchar)*cp;
|
||||
/* handle simple 0x00-0x7f characters here */
|
||||
if(ch <= 0x7f) {
|
||||
if(ch <= 0x7f) {
|
||||
if( ch < ' ' || ch > 0x7E) /* control char or DEL */
|
||||
goto fail;
|
||||
cp++;
|
||||
@ -227,8 +227,14 @@ fail:
|
||||
* Formerly
|
||||
NC_new_string(count, str)
|
||||
*/
|
||||
|
||||
#ifdef __arm__
|
||||
NC_string *
|
||||
new_NC_string(size_t slen, const signed char *str)
|
||||
#else
|
||||
NC_string *
|
||||
new_NC_string(size_t slen, const char *str)
|
||||
#endif
|
||||
{
|
||||
NC_string *ncstrp;
|
||||
size_t sz = M_RNDUP(sizeof(NC_string)) + slen + 1;
|
||||
@ -236,7 +242,7 @@ new_NC_string(size_t slen, const char *str)
|
||||
#if 0
|
||||
sz = _RNDUP(sz, X_ALIGN);
|
||||
#endif
|
||||
|
||||
|
||||
ncstrp = (NC_string *)malloc(sz);
|
||||
if( ncstrp == NULL )
|
||||
return NULL;
|
||||
@ -251,7 +257,7 @@ new_NC_string(size_t slen, const char *str)
|
||||
(void) strncpy(ncstrp->cp, str, ncstrp->nchars +1);
|
||||
ncstrp->cp[ncstrp->nchars] = 0;
|
||||
}
|
||||
|
||||
|
||||
return(ncstrp);
|
||||
}
|
||||
|
||||
@ -262,9 +268,15 @@ new_NC_string(size_t slen, const char *str)
|
||||
* Formerly
|
||||
NC_re_string()
|
||||
*/
|
||||
int
|
||||
set_NC_string(NC_string *ncstrp, const char *str)
|
||||
{
|
||||
|
||||
#ifdef __arm__
|
||||
int
|
||||
set_NC_string(NC_string *ncstrp, const signed char *str)
|
||||
#else
|
||||
int
|
||||
set_NC_string(NC_string *ncstrp, const char *str)
|
||||
#endif
|
||||
{
|
||||
size_t slen;
|
||||
|
||||
assert(str != NULL && *str != 0);
|
||||
|
||||
145
libsrc/v1hpg.c
145
libsrc/v1hpg.c
@ -15,8 +15,8 @@
|
||||
/*
|
||||
* This module defines the external representation
|
||||
* of the "header" of a netcdf version one file and
|
||||
* the version two variant that uses 64-bit file
|
||||
* offsets instead of the 32-bit file offsets in version
|
||||
* the version two variant that uses 64-bit file
|
||||
* offsets instead of the 32-bit file offsets in version
|
||||
* one files.
|
||||
* For each of the components of the NC structure,
|
||||
* There are (static) ncx_len_XXX(), v1h_put_XXX()
|
||||
@ -85,15 +85,19 @@ fault_v1hs(v1hs *gsp, size_t extent)
|
||||
|
||||
if(gsp->base != NULL)
|
||||
{
|
||||
const ptrdiff_t incr = (char *)gsp->pos - (char *)gsp->base;
|
||||
#ifdef __arm__
|
||||
const ptrdiff_t incr = (signed char *)gsp->pos - (signed char *)gsp->base;
|
||||
#else
|
||||
const ptrdiff_t incr = (char *)gsp->pos - (char *)gsp->base;
|
||||
#endif
|
||||
status = rel_v1hs(gsp);
|
||||
if(status)
|
||||
return status;
|
||||
gsp->offset += incr;
|
||||
}
|
||||
|
||||
|
||||
if(extent > gsp->extent)
|
||||
gsp->extent = extent;
|
||||
gsp->extent = extent;
|
||||
|
||||
status = ncio_get(gsp->nciop,
|
||||
gsp->offset, gsp->extent,
|
||||
@ -102,8 +106,12 @@ fault_v1hs(v1hs *gsp, size_t extent)
|
||||
return status;
|
||||
|
||||
gsp->pos = gsp->base;
|
||||
gsp->end = (char *)gsp->base + gsp->extent;
|
||||
|
||||
#ifdef __arm__
|
||||
gsp->end = (signed char *)gsp->base + gsp->extent;
|
||||
#else
|
||||
gsp->end = (char *)gsp->base + gsp->extent;
|
||||
#endif
|
||||
return ENOERR;
|
||||
}
|
||||
|
||||
@ -120,10 +128,15 @@ fprintf(stderr, "nextread %lu, remaining %lu\n",
|
||||
(unsigned long)nextread,
|
||||
(unsigned long)((char *)gsp->end - (char *)gsp->pos));
|
||||
#endif
|
||||
|
||||
if((char *)gsp->pos + nextread <= (char *)gsp->end)
|
||||
#ifdef __arm__
|
||||
if((signed char *)gsp->pos + nextread <= (signed char *)gsp->end)
|
||||
return ENOERR;
|
||||
return fault_v1hs(gsp, nextread);
|
||||
#else
|
||||
if((char *)gsp->pos + nextread <= (char *)gsp->end)
|
||||
return ENOERR;
|
||||
#endif
|
||||
|
||||
return fault_v1hs(gsp, nextread);
|
||||
}
|
||||
|
||||
/* End v1hs */
|
||||
@ -179,8 +192,14 @@ v1h_put_nc_type(v1hs *psp, const nc_type *typep)
|
||||
if(status != ENOERR)
|
||||
return status;
|
||||
status = ncx_put_int_int(psp->pos, &itype);
|
||||
psp->pos = (void *)((char *)psp->pos + X_SIZEOF_INT);
|
||||
return status;
|
||||
|
||||
#ifdef __arm__
|
||||
psp->pos = (void *)((signed char *)psp->pos + X_SIZEOF_INT);
|
||||
#else
|
||||
psp->pos = (void *)((char *)psp->pos + X_SIZEOF_INT);
|
||||
#endif
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
@ -193,7 +212,11 @@ v1h_get_nc_type(v1hs *gsp, nc_type *typep)
|
||||
if(status != ENOERR)
|
||||
return status;
|
||||
status = ncx_get_int_int(gsp->pos, &type);
|
||||
gsp->pos = (void *)((char *)gsp->pos + X_SIZEOF_INT);
|
||||
#ifdef __arm__
|
||||
gsp->pos = (void *)((signed char *)gsp->pos + X_SIZEOF_INT);
|
||||
#else
|
||||
gsp->pos = (void *)((char *)gsp->pos + X_SIZEOF_INT);
|
||||
#endif
|
||||
if(status != ENOERR)
|
||||
return status;
|
||||
|
||||
@ -230,8 +253,12 @@ v1h_put_NCtype(v1hs *psp, NCtype type)
|
||||
if(status != ENOERR)
|
||||
return status;
|
||||
status = ncx_put_int_int(psp->pos, &itype);
|
||||
#ifdef __arm__
|
||||
psp->pos = (void *)((signed char *)psp->pos + X_SIZEOF_INT);
|
||||
#else
|
||||
psp->pos = (void *)((char *)psp->pos + X_SIZEOF_INT);
|
||||
return status;
|
||||
#endif
|
||||
return status;
|
||||
}
|
||||
|
||||
/* Read a NCtype from the header */
|
||||
@ -243,8 +270,13 @@ v1h_get_NCtype(v1hs *gsp, NCtype *typep)
|
||||
if(status != ENOERR)
|
||||
return status;
|
||||
status = ncx_get_int_int(gsp->pos, &type);
|
||||
gsp->pos = (void *)((char *)gsp->pos + X_SIZEOF_INT);
|
||||
if(status != ENOERR)
|
||||
|
||||
#ifdef __arm__
|
||||
gsp->pos = (void *)((signed char *)gsp->pos + X_SIZEOF_INT);
|
||||
#else
|
||||
gsp->pos = (void *)((char *)gsp->pos + X_SIZEOF_INT);
|
||||
#endif
|
||||
if(status != ENOERR)
|
||||
return status;
|
||||
/* else */
|
||||
*typep = (NCtype) type;
|
||||
@ -266,7 +298,7 @@ ncx_len_NC_string(const NC_string *ncstrp, int version)
|
||||
|
||||
assert(ncstrp != NULL);
|
||||
|
||||
if(ncstrp->nchars != 0)
|
||||
if(ncstrp->nchars != 0)
|
||||
{
|
||||
#if 0
|
||||
assert(ncstrp->nchars % X_ALIGN == 0);
|
||||
@ -327,7 +359,7 @@ v1h_get_NC_string(v1hs *gsp, NC_string **ncstrpp)
|
||||
assert(ncstrp->nchars % X_ALIGN == 0);
|
||||
status = check_v1hs(gsp, ncstrp->nchars);
|
||||
#else
|
||||
|
||||
|
||||
status = check_v1hs(gsp, _RNDUP(ncstrp->nchars, X_ALIGN));
|
||||
#endif
|
||||
if(status != ENOERR)
|
||||
@ -345,7 +377,7 @@ v1h_get_NC_string(v1hs *gsp, NC_string **ncstrpp)
|
||||
unwind_alloc:
|
||||
free_NC_string(ncstrp);
|
||||
return status;
|
||||
|
||||
|
||||
}
|
||||
|
||||
/* End NC_string */
|
||||
@ -517,7 +549,7 @@ v1h_get_NC_dimarray(v1hs *gsp, NC_dimarray *ncap)
|
||||
status = v1h_get_size_t(gsp, &ncap->nelems);
|
||||
if(status != ENOERR)
|
||||
return status;
|
||||
|
||||
|
||||
if(ncap->nelems == 0)
|
||||
return ENOERR;
|
||||
/* else */
|
||||
@ -588,24 +620,29 @@ v1h_put_NC_attrV(v1hs *psp, const NC_attr *attrp)
|
||||
const size_t perchunk = psp->extent;
|
||||
size_t remaining = attrp->xsz;
|
||||
void *value = attrp->xvalue;
|
||||
size_t nbytes;
|
||||
size_t nbytes;
|
||||
|
||||
assert(psp->extent % X_ALIGN == 0);
|
||||
|
||||
|
||||
do {
|
||||
nbytes = MIN(perchunk, remaining);
|
||||
|
||||
|
||||
status = check_v1hs(psp, nbytes);
|
||||
if(status != ENOERR)
|
||||
return status;
|
||||
|
||||
|
||||
(void) memcpy(psp->pos, value, nbytes);
|
||||
|
||||
psp->pos = (void *)((char *)psp->pos + nbytes);
|
||||
#ifdef __arm__
|
||||
psp->pos = (void *)((signed char *)psp->pos + nbytes);
|
||||
value = (void *)((signed char *)value + nbytes);
|
||||
#else
|
||||
psp->pos = (void *)((char *)psp->pos + nbytes);
|
||||
value = (void *)((char *)value + nbytes);
|
||||
remaining -= nbytes;
|
||||
#endif
|
||||
remaining -= nbytes;
|
||||
|
||||
} while(remaining != 0);
|
||||
} while(remaining != 0);
|
||||
|
||||
return ENOERR;
|
||||
}
|
||||
@ -648,22 +685,27 @@ v1h_get_NC_attrV(v1hs *gsp, NC_attr *attrp)
|
||||
const size_t perchunk = gsp->extent;
|
||||
size_t remaining = attrp->xsz;
|
||||
void *value = attrp->xvalue;
|
||||
size_t nget;
|
||||
size_t nget;
|
||||
|
||||
do {
|
||||
nget = MIN(perchunk, remaining);
|
||||
|
||||
|
||||
status = check_v1hs(gsp, nget);
|
||||
if(status != ENOERR)
|
||||
return status;
|
||||
|
||||
|
||||
(void) memcpy(value, gsp->pos, nget);
|
||||
|
||||
gsp->pos = (void *)((char *)gsp->pos + nget);
|
||||
#ifdef __arm__
|
||||
gsp->pos = (void *)((signed char *)gsp->pos + nget);
|
||||
value = (void *)((signed char *)value + nget);
|
||||
#else
|
||||
gsp->pos = (void *)((char *)gsp->pos + nget);
|
||||
value = (void *)((char *)value + nget);
|
||||
remaining -= nget;
|
||||
#endif
|
||||
|
||||
} while(remaining != 0);
|
||||
remaining -= nget;
|
||||
|
||||
} while(remaining != 0);
|
||||
|
||||
return ENOERR;
|
||||
}
|
||||
@ -697,7 +739,7 @@ v1h_get_NC_attr(v1hs *gsp, NC_attr **attrpp)
|
||||
status = NC_ENOMEM;
|
||||
goto unwind_name;
|
||||
}
|
||||
|
||||
|
||||
status = v1h_get_NC_attrV(gsp, attrp);
|
||||
if(status != ENOERR)
|
||||
{
|
||||
@ -808,7 +850,7 @@ v1h_get_NC_attrarray(v1hs *gsp, NC_attrarray *ncap)
|
||||
status = v1h_get_size_t(gsp, &ncap->nelems);
|
||||
if(status != ENOERR)
|
||||
return status;
|
||||
|
||||
|
||||
if(ncap->nelems == 0)
|
||||
return ENOERR;
|
||||
/* else */
|
||||
@ -988,7 +1030,7 @@ v1h_get_NC_var(v1hs *gsp, NC_var **varpp)
|
||||
&varp->begin, gsp->version == 1 ? 4 : 8);
|
||||
if(status != ENOERR)
|
||||
goto unwind_alloc;
|
||||
|
||||
|
||||
*varpp = varp;
|
||||
return ENOERR;
|
||||
|
||||
@ -1092,11 +1134,11 @@ v1h_get_NC_vararray(v1hs *gsp, NC_vararray *ncap)
|
||||
status = v1h_get_NCtype(gsp, &type);
|
||||
if(status != ENOERR)
|
||||
return status;
|
||||
|
||||
|
||||
status = v1h_get_size_t(gsp, &ncap->nelems);
|
||||
if(status != ENOERR)
|
||||
return status;
|
||||
|
||||
|
||||
if(ncap->nelems == 0)
|
||||
return ENOERR;
|
||||
/* else */
|
||||
@ -1153,16 +1195,16 @@ NC_computeshapes(NC3_INFO* ncp)
|
||||
|
||||
if(ncp->vars.nelems == 0)
|
||||
return(0);
|
||||
|
||||
|
||||
for( /*NADA*/; vpp < end; vpp++)
|
||||
{
|
||||
status = NC_var_shape(*vpp, &ncp->dims);
|
||||
if(status != ENOERR)
|
||||
return(status);
|
||||
|
||||
if(IS_RECVAR(*vpp))
|
||||
if(IS_RECVAR(*vpp))
|
||||
{
|
||||
if(first_rec == NULL)
|
||||
if(first_rec == NULL)
|
||||
first_rec = *vpp;
|
||||
if((*vpp)->len == UINT32_MAX &&
|
||||
fIsSet(ncp->flags, NC_64BIT_OFFSET)) /* Flag for large last record */
|
||||
@ -1229,7 +1271,7 @@ ncx_len_NC(const NC3_INFO* ncp, size_t sizeof_off_t)
|
||||
xlen += ncx_len_NC_dimarray(&ncp->dims, version);
|
||||
xlen += ncx_len_NC_attrarray(&ncp->attrs, version);
|
||||
xlen += ncx_len_NC_vararray(&ncp->vars, sizeof_off_t, version);
|
||||
|
||||
|
||||
return xlen;
|
||||
}
|
||||
|
||||
@ -1252,7 +1294,7 @@ ncx_put_NC(const NC3_INFO* ncp, void **xpp, off_t offset, size_t extent)
|
||||
ps.version = 5;
|
||||
else if (ncp->flags & NC_64BIT_OFFSET)
|
||||
ps.version = 2;
|
||||
else
|
||||
else
|
||||
ps.version = 1;
|
||||
|
||||
if(xpp == NULL)
|
||||
@ -1272,7 +1314,7 @@ ncx_put_NC(const NC3_INFO* ncp, void **xpp, off_t offset, size_t extent)
|
||||
}
|
||||
else if(extent > ncp->chunk)
|
||||
extent = ncp->chunk;
|
||||
|
||||
|
||||
ps.offset = 0;
|
||||
ps.extent = extent;
|
||||
ps.base = NULL;
|
||||
@ -1356,7 +1398,7 @@ nc_get_NC(NC3_INFO* ncp)
|
||||
*/
|
||||
off_t filesize;
|
||||
size_t extent = ncp->xsz;
|
||||
|
||||
|
||||
if(extent <= ((fIsSet(ncp->flags, NC_64BIT_DATA))?MIN_NC5_XSZ:MIN_NC3_XSZ))
|
||||
{
|
||||
status = ncio_filesize(ncp->nciop, &filesize);
|
||||
@ -1403,7 +1445,7 @@ nc_get_NC(NC3_INFO* ncp)
|
||||
(const void **)(&gs.pos), sizeof(magic), magic);
|
||||
if(status != ENOERR)
|
||||
goto unwind_get;
|
||||
|
||||
|
||||
if(memcmp(magic, ncmagic, sizeof(ncmagic)-1) != 0)
|
||||
{
|
||||
status = NC_ENOTNC;
|
||||
@ -1429,7 +1471,7 @@ nc_get_NC(NC3_INFO* ncp)
|
||||
goto unwind_get;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
{
|
||||
size_t nrecs = 0;
|
||||
if (gs.version == 5) {
|
||||
@ -1444,8 +1486,11 @@ nc_get_NC(NC3_INFO* ncp)
|
||||
NC_set_numrecs(ncp, nrecs);
|
||||
}
|
||||
|
||||
assert((char *)gs.pos < (char *)gs.end);
|
||||
|
||||
#ifdef __arm__
|
||||
assert((signed char *)gs.pos < (signed char *)gs.end);
|
||||
#else
|
||||
assert((char *)gs.pos < (char *)gs.end);
|
||||
#endif
|
||||
status = v1h_get_NC_dimarray(&gs, &ncp->dims);
|
||||
if(status != ENOERR)
|
||||
goto unwind_get;
|
||||
@ -1457,7 +1502,7 @@ nc_get_NC(NC3_INFO* ncp)
|
||||
status = v1h_get_NC_vararray(&gs, &ncp->vars);
|
||||
if(status != ENOERR)
|
||||
goto unwind_get;
|
||||
|
||||
|
||||
ncp->xsz = ncx_len_NC(ncp, (gs.version == 1) ? 4 : 8);
|
||||
|
||||
status = NC_computeshapes(ncp);
|
||||
|
||||
@ -38,8 +38,8 @@ main() {/* create cdf5_test */
|
||||
testing here too. */
|
||||
{
|
||||
int xx = 0;
|
||||
double *tp = (double*)malloc(sizeof(double)*3);
|
||||
double *tph = tp;
|
||||
signed char *tp = (signed char*)malloc(sizeof(signed char)*3);
|
||||
signed char *tph = tp;
|
||||
unsigned char *xp = (unsigned char *)malloc(sizeof(unsigned char)*3);
|
||||
unsigned char *xph = xp;
|
||||
tp[0] = -2;
|
||||
@ -47,7 +47,7 @@ main() {/* create cdf5_test */
|
||||
tp[2] = -1;
|
||||
|
||||
for(i = 0; i < 3; i++)
|
||||
*xp++ = (unsigned)(signed char)*tp++;
|
||||
*xp++ = (unsigned char)*tp++;
|
||||
|
||||
xx = 1;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user