epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fixed GDD: aitConvertStringEnum16 does nothing if pEnumStringTable==NULL

Browse Source 
mantis 211
This commit is contained in:
Jeff Hill
2005-10-27 23:38:26 +00:00
parent f8cb3e93e8
commit 0640cc0995
1 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/gdd/aitConvert.cc
View File

@@ -174,20 +174,30 @@ static int aitConvertStringEnum16(void* d,const void* s,
{
aitIndex i;
int status=0;
char temp[AIT_FIXED_STRING_SIZE];
aitString* out=(aitString*)d;
aitEnum16* in=(aitEnum16*)s;
for (i=0;i<c;i++) {
unsigned nChar;
if ( pEnumStringTable && in[i] < pEnumStringTable->numberOfStrings() ) {
out[i].copy( pEnumStringTable->getString (in[i]) );
nChar = pEnumStringTable->getStringLength ( in[i] );
unsigned nChar = pEnumStringTable->getStringLength ( in[i] );
if ( nChar < static_cast <unsigned> ( INT_MAX - status ) ) {
out[i].copy( pEnumStringTable->getString ( in[i] ), nChar );
status += static_cast <int> ( nChar );;
}
else {
return -1;
}
}
else {
nChar = sprintf(temp, "%hu",in[i]);
assert (nChar>0);
char temp[AIT_FIXED_STRING_SIZE];
int tmpStatus = sprintf ( temp, "%hu", in[i] );
if ( tmpStatus >= 0 && tmpStatus < INT_MAX - status ) {
out[i].copy ( temp, static_cast < unsigned > ( tmpStatus ) );
status += tmpStatus;
}
else {
return -1;
}
}
status += (int) nChar;
}
return status;
}
@@ -212,16 +222,28 @@ static int aitConvertFixedStringEnum16(void* d,const void* s,
aitFixedString* out=(aitFixedString*)d;
aitEnum16* in=(aitEnum16*)s;
for (i=0;i<c;i++) {
unsigned nChar;
if ( pEnumStringTable && in[i] < pEnumStringTable->numberOfStrings() ) {
pEnumStringTable->getString ( in[i], out[i].fixed_string, sizeof( out[i].fixed_string ) );
nChar = pEnumStringTable->getStringLength ( in[i] );
unsigned nChar = pEnumStringTable->getStringLength ( in[i] );
if ( nChar < static_cast < unsigned > ( INT_MAX - status ) ) {
pEnumStringTable->getString (
in[i],
out[i].fixed_string,
sizeof( out[i].fixed_string ) );
status += static_cast < int > ( nChar );
}
else {
return -1;
}
}
else {
nChar = sprintf(out[i].fixed_string,"%hu",in[i]);
assert (nChar>0);
int tmpStatus = sprintf ( out[i].fixed_string, "%hu", in[i] );
if ( tmpStatus > 0 && tmpStatus < INT_MAX - status ) {
status += tmpStatus;
}
else {
return -1;
}
}
status += (int) nChar;
}
return status;
}