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

epicsSnprintf: prevent buffer overflow; use posix convention

Browse Source
This commit is contained in:
Marty Kraimer
2004-10-04 12:39:16 +00:00
parent 31c9c89350
commit 46cfe589d5
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libCom/osi/os/vxWorks/osdStdio.c
View File

@@ -21,21 +21,29 @@ struct outStr_s {
static STATUS outRoutine(char *buffer, int nchars, int outarg) {
struct outStr_s *poutStr = (struct outStr_s *) outarg;
int len = min(poutStr->free, nchars);
if(len<=0) return ERROR;
strncat(poutStr->str, buffer, len);
poutStr->free -= nchars;
int free = poutStr->free;
int len;
if(free<=0) { /*let fioFormatV continue to count length*/
return OK;
} else if(free==1) {
len = 1;
} else { /* free>1 */
len = min(free-1, nchars);
strncpy(poutStr->str, buffer, len);
poutStr->str += len;
}
poutStr->free -= len;
/*make sure final string is null terminated*/
*poutStr->str = 0;
return OK;
}
int epicsVsnprintf(char *str, size_t size, const char *format, va_list ap) {
struct outStr_s outStr;
*str = '\0';
outStr.str = str;
outStr.free = size-1;
outStr.free = size;
return fioFormatV(format, ap, outRoutine, (int) &outStr);
}