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

Fix gcc warning 'stringop-truncation'

Browse Source
This commit is contained in:
zimoch
2025-11-07 16:04:36 +01:00
parent 422182d672
commit 9748cbd394
9 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ca/src/perl/Cap5.xs
View File

@@ -613,6 +613,7 @@ void CA_put(SV *ca_ref, SV *val, ...) {
break;
case DBF_STRING:
strncpy(data.dbr_string, SvPV_nolen(val), MAX_STRING_SIZE);
data.dbr_string[MAX_STRING_SIZE-1] = 0;
break;
}
status = ca_put(type, pch->chan, &data);
@@ -705,6 +706,7 @@ void CA_put_callback(SV *ca_ref, SV *sub, SV *val, ...) {
break;
case DBF_STRING:
strncpy(data.dbr_string, SvPV_nolen(val), MAX_STRING_SIZE);
data.dbr_string[MAX_STRING_SIZE-1] = 0;
break;
}

13
modules/database/src/ioc/db/dbAccess.c
View File

@@ -365,13 +365,14 @@ static void getOptions(DBADDR *paddr, char **poriginal, long *options,
}
if( (*options) & DBR_AMSG ) {
if (!pfl) {
STATIC_ASSERT(sizeof(pcommon->amsg)==sizeof(pfl->amsg));
strncpy(pbuffer, pcommon->amsg, sizeof(pcommon->amsg)-1);
STATIC_ASSERT(sizeof(pcommon->amsg)==DB_AMSG_SIZE);
strncpy(pbuffer, pcommon->amsg, DB_AMSG_SIZE);
} else {
strncpy(pbuffer, pfl->amsg,sizeof(pfl->amsg)-1);
STATIC_ASSERT(sizeof(pfl->amsg)==DB_AMSG_SIZE);
strncpy(pbuffer, pfl->amsg, DB_AMSG_SIZE);
}
pbuffer[sizeof(pcommon->amsg)-1] = '\0';
pbuffer += sizeof(pcommon->amsg);
pbuffer[DB_AMSG_SIZE-1] = '\0';
pbuffer += DB_AMSG_SIZE;
}
if( (*options) & DBR_UNITS ) {
memset(pbuffer,'\0',dbr_units_size);
@@ -851,7 +852,7 @@ static long getLinkValue(DBADDR *paddr, short dbrType,
{
const char *rtnString = dbGetString(&dbEntry);
strncpy(pbuf, rtnString, maxlen-1);
strncpy(pbuf, rtnString, maxlen);
pbuf[maxlen-1] = 0;
if(dbrType!=DBR_STRING)
nReq = strlen(pbuf)+1;

4
modules/database/src/ioc/dbStatic/dbStaticLib.c
View File

@@ -743,8 +743,8 @@ static long dbAddOnePath (DBBASE *pdbbase, const char *path, unsigned length)
ppathList = (ELLLIST *)pdbbase->pathPvt;
pdbPathNode = (dbPathNode *)dbCalloc(1, sizeof(dbPathNode));
pdbPathNode->directory = (char *)dbCalloc(length+1, sizeof(char));
strncpy(pdbPathNode->directory, path, length);
pdbPathNode->directory = (char *)dbMalloc(length+1);
strncpy(pdbPathNode->directory, path, length+1);
pdbPathNode->directory[length] = '\0';
ellAdd(ppathList, &pdbPathNode->node);
return 0;

8
modules/database/src/std/rec/biRecord.c
View File

@@ -181,10 +181,10 @@ static long get_enum_str(const DBADDR *paddr, char *pstring)
if(index!=biRecordVAL) {
strcpy(pstring,"Illegal_Value");
} else if(*pfield==0) {
strncpy(pstring,prec->znam,sizeof(prec->znam));
memcpy(pstring,prec->znam,sizeof(prec->znam));
pstring[sizeof(prec->znam)] = 0;
} else if(*pfield==1) {
strncpy(pstring,prec->onam,sizeof(prec->onam));
memcpy(pstring,prec->onam,sizeof(prec->onam));
pstring[sizeof(prec->onam)] = 0;
} else {
strcpy(pstring,"Illegal_Value");
@@ -198,9 +198,9 @@ static long get_enum_strs(const DBADDR *paddr,struct dbr_enumStrs *pes)
pes->no_str = 2;
memset(pes->strs,'\0',sizeof(pes->strs));
strncpy(pes->strs[0],prec->znam,sizeof(prec->znam));
memcpy(pes->strs[0],prec->znam,sizeof(prec->znam));
if(*prec->znam!=0) pes->no_str=1;
strncpy(pes->strs[1],prec->onam,sizeof(prec->onam));
memcpy(pes->strs[1],prec->onam,sizeof(prec->onam));
if(*prec->onam!=0) pes->no_str=2;
return(0);
}

8
modules/database/src/std/rec/boRecord.c
View File

@@ -328,10 +328,10 @@ static long get_enum_str(const DBADDR *paddr, char *pstring)
if(index!=indexof(VAL)) {
strcpy(pstring,"Illegal_Value");
} else if(*pfield==0) {
strncpy(pstring,prec->znam,sizeof(prec->znam));
memcpy(pstring,prec->znam,sizeof(prec->znam));
pstring[sizeof(prec->znam)] = 0;
} else if(*pfield==1) {
strncpy(pstring,prec->onam,sizeof(prec->onam));
memcpy(pstring,prec->onam,sizeof(prec->onam));
pstring[sizeof(prec->onam)] = 0;
} else {
strcpy(pstring,"Illegal_Value");
@@ -346,9 +346,9 @@ static long get_enum_strs(const DBADDR *paddr,struct dbr_enumStrs *pes)
/*SETTING no_str=0 breaks channel access clients*/
pes->no_str = 2;
memset(pes->strs,'\0',sizeof(pes->strs));
strncpy(pes->strs[0],prec->znam,sizeof(pes->strs[0]));
memcpy(pes->strs[0],prec->znam,sizeof(pes->strs[0]));
if(*prec->znam!=0) pes->no_str=1;
strncpy(pes->strs[1],prec->onam,sizeof(pes->strs[1]));
memcpy(pes->strs[1],prec->onam,sizeof(pes->strs[1]));
if(*prec->onam!=0) pes->no_str=2;
return(0);
}

2
modules/libcom/src/iocsh/iocsh.cpp
View File

@@ -867,7 +867,7 @@ cvtArg (const char *filename, int lineno, char *arg, iocshArgBuf *argBuf,
showError(filename, lineno, ANSI_RED("Out of memory!"));
return 0;
}
strncpy(argBuf->sval, arg, slen);
memcpy(argBuf->sval, arg, slen + 1);
} else {
argBuf->sval = NULL;
}

4
modules/libcom/src/osi/epicsTime.cpp
View File

@@ -256,7 +256,7 @@ size_t epicsStdCall epicsTimeToStrftime (char *pBuff, size_t bufLength, const ch
if ( tmpLen >= bufLenLeft ) {
tmpLen = bufLenLeft - 1;
}
strncpy ( pBufCur, pOVF, tmpLen );
memcpy ( pBufCur, pOVF, tmpLen );
pBufCur[tmpLen] = '\0';
pBufCur += tmpLen;
bufLenLeft -= tmpLen;
@@ -268,7 +268,7 @@ size_t epicsStdCall epicsTimeToStrftime (char *pBuff, size_t bufLength, const ch
if ( tmpLen >= bufLenLeft ) {
tmpLen = bufLenLeft - 1;
}
strncpy ( pBufCur, pDoesntFit, tmpLen );
memcpy ( pBufCur, pDoesntFit, tmpLen );
pBufCur[tmpLen] = '\0';
pBufCur += tmpLen;
bufLenLeft -= tmpLen;

2
modules/libcom/src/osi/osiSock.c
View File

@@ -73,7 +73,7 @@ unsigned epicsStdCall sockAddrToA (
return len;
}
else {
strncpy ( pBuf, "<Ukn Addr Type>", bufSize-1 );
memcpy ( pBuf, pErrStr, bufSize-1 );
pBuf[bufSize-1] = '\0';
return bufSize-1;
}

2
modules/libcom/test/epicsStackTraceTest.c
View File

@@ -93,7 +93,7 @@ static void logClient(void *ptr, const char *msg)
if ( sz > mx )
sz = mx;
strncpy( td->buf+td->pos, msg, sz );
memcpy( td->buf+td->pos, msg, sz );
td->pos += sz;
}