epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

ioc/db: dbConstLoadLS handle size=0

Browse Source 
handle size=0 and clarify
This commit is contained in:
Michael Davidsaver
2017-04-20 21:13:50 -04:00
parent 8b24383e9e
commit 7121b016d5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ioc/db/dbConstLink.c
View File

@@ -77,6 +77,8 @@ static long dbConstLoadLS(struct link *plink, char *pbuffer, epicsUInt32 size,
if (!pstr)
return S_db_badField;
if (!size)
return 0;
len = strlen(pstr);
/* FIXME This handles the common case, but not the general one... */
@@ -85,11 +87,11 @@ static long dbConstLoadLS(struct link *plink, char *pbuffer, epicsUInt32 size,
pstr += 2;
len -= 4;
}
if (--size > len) size = len;
if (len+1 > size) len = size-1;
strncpy(pbuffer, pstr, size);
pbuffer[size] = 0;
*plen = (epicsUInt32) strlen(pbuffer) + 1;
memcpy(pbuffer, pstr, len);
pbuffer[len] = 0;
*plen = len+1;
return 0;
}