mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-30 16:10:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Github issue: https://github.com/Unidata/netcdf-c/issues/206

Browse Source 
Re e-eupport VGQ-678069
It was noticed that an attribute value of "nan." was being treated as
legal (it should be "nan"). The reason is that sscanf was not be checked
to see that all the attribute value characters were being read.
Solution is to verify that all characters were being consumed.
This commit is contained in:
Dennis Heimbigner 2016-01-28 22:18:51 -07:00
parent 990296c671
commit b2a25bde13
3 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libdap2/dapcvt.c
View File

@ -203,8 +203,9 @@ dapcvtattrval(nc_type etype, void* dst, NClist* src)
char* dstmem = (char*)dst;
for(i=0;i<nvalues;i++) {
char* s = (char*)nclistget(src,i);
size_t slen = strlen(s);
int nread = 0; /* # of chars read by sscanf */
ok = 0;
switch (etype) {
@ -213,60 +214,60 @@ dapcvtattrval(nc_type etype, void* dst, NClist* src)
unsigned char* p = (unsigned char*)dstmem;
#ifdef _MSC_VER
ok = sscanf(s,"%hC",p);
ok = sscanf(s,"%hC%n",p,&nread);
_ASSERTE(_CrtCheckMemory());
#else
ok = sscanf(s,"%hhu",p);
ok = sscanf(s,"%hhu%n",p,&nread);
#endif
} break;
case NC_CHAR: {
signed char* p = (signed char*)dstmem;
ok = sscanf(s,"%c",p);
ok = sscanf(s,"%c%n",p,&nread);
} break;
case NC_SHORT: {
short* p = (short*)dstmem;
ok = sscanf(s,"%hd",p);
ok = sscanf(s,"%hd%n",p,&nread);
} break;
case NC_INT: {
int* p = (int*)dstmem;
ok = sscanf(s,"%d",p);
ok = sscanf(s,"%d%n",p,&nread);
} break;
case NC_FLOAT: {
float* p = (float*)dstmem;
ok = sscanf(s,"%g",p);
ok = sscanf(s,"%g%n",p,&nread);
} break;
case NC_DOUBLE: {
double* p = (double*)dstmem;
ok = sscanf(s,"%lg",p);
ok = sscanf(s,"%lg%n",p,&nread);
} break;
case NC_UBYTE: {
unsigned char* p = (unsigned char*)dstmem;
#ifdef _MSC_VER
ok = sscanf(s, "%hc", p);
ok = sscanf(s, "%hc%n", p,&nread);
_ASSERTE(_CrtCheckMemory());
#else
ok = sscanf(s,"%hhu",p);
ok = sscanf(s,"%hhu%n",p,&nread);
#endif
} break;
case NC_USHORT: {
unsigned short* p = (unsigned short*)dstmem;
ok = sscanf(s,"%hu",p);
ok = sscanf(s,"%hu%n",p,&nread);
} break;
case NC_UINT: {
unsigned int* p = (unsigned int*)dstmem;
ok = sscanf(s,"%u",p);
ok = sscanf(s,"%u%n",p,&nread);
} break;
case NC_INT64: {
long long* p = (long long*)dstmem;
#ifdef _MSC_VER
ok = sscanf(s, "%I64d", p);
ok = sscanf(s, "%I64d%n", p,&nread);
#else
ok = sscanf(s,"%lld",p);
ok = sscanf(s,"%lld%n",p,&nread);
#endif
} break;
case NC_UINT64: {
unsigned long long* p = (unsigned long long*)dstmem;
ok = sscanf(s,"%llu",p);
ok = sscanf(s,"%llu%n",p,&nread);
} break;
case NC_STRING: case NC_URL: {
char** p = (char**)dstmem;
@ -276,7 +277,7 @@ dapcvtattrval(nc_type etype, void* dst, NClist* src)
default:
PANIC1("unexpected nc_type: %d",(int)etype);
}
if(ok != 1) {ncstat = NC_EINVAL; goto done;}
if(ok != 1 || nread != slen) {ncstat = NC_EINVAL; goto done;}
dstmem += memsize;
}
done:

14
libdap2/env
View File

@ -1,12 +1,20 @@
#TOP="/home/dmh/git/netcdf-c"
TOP="/cygdrive/f/git/netcdf-c"
alias xx="cd ..;make; cd libdap2"
PARMS=""; ARGS=""; CON="" ; CE=""; OCON="" ; VAR=""; SHARP='#'
alias q0=;alias qq=;alias qv=;alias q=;alias qh=;alias qqh=;alias qall=;alias qv=;alias qo=;
F="http://remotetest.unidata.ucar.edu/dts/test.01"
F="https://eosdap.hdfgroup.org:8080/opendap/data/test/kent/ceres-converted/edition_4/CER_SSF1deg-Hour_Terra-MODIS_TestSuite_000000.200407D01.hdf"
if test -e "/cygdrive/f/git/netcdf-c" ; then
TOP="/cygdrive/f/git/netcdf-c"
elif test -e "/cygdrive/d/git/netcdf-c" ; then
TOP="/cygdrive/d/git/netcdf-c"
elif test -e "/home/dmh/git/netcdf-c" ; then
TOP="/home/dmh/git/netcdf-c"
else
echo "cannot locate ncdump"
fi
if test -f ./ncd ; then
PROG=./ncd

8
libdap2/ncd2dispatch.c
View File

@ -929,6 +929,7 @@ buildattribute(NCDAPCOMMON* dapcomm, NCattribute* att, nc_type vartype, int vari
else
ncstat = nc_put_att_text(drno->substrate,varid,att->name,strlen(newstring),newstring);
free(newstring);
if(ncstat) goto done;
} else {
nc_type atype;
unsigned int typesize;
@ -955,13 +956,14 @@ buildattribute(NCDAPCOMMON* dapcomm, NCattribute* att, nc_type vartype, int vari
#ifdef _MSC_VER
_ASSERTE(_CrtCheckMemory());
#endif
if(ncstat) {nullfree(mem); goto done;}
ncstat = nc_put_att(drno->substrate,varid,att->name,atype,nvalues,mem);
#ifdef _MSC_VER
_ASSERTE(_CrtCheckMemory());
#endif
if (mem != NULL)
free(mem);
}
if(ncstat) {nullfree(mem); goto done;}
}
done:
return THROW(ncstat);
}