Skip to content
Snippets Groups Projects
Commit 19b855c0 authored by Jan David Mol's avatar Jan David Mol
Browse files

bug 1362: strcpy/strcat/sprintf -> strncpy/strncat/snprintf

parent fbaaa2c2
No related branches found
No related tags found
No related merge requests found
......@@ -62,7 +62,7 @@ void StatCal::_readData(uint mode)
{
ConfigLocator CL;
char baseName[256];
sprintf(baseName, "CalTable_mode%d.dat", mode);
snprintf(baseName, sizeof baseName, "CalTable_mode%d.dat", mode);
itsFileName = CL.locate(baseName);
complex<double> value;
......
......@@ -1063,13 +1063,14 @@ bool TBBDriver::CheckAlive(GCFEvent& event, GCFPortInterface& port)
char boardstr[40];
char instr[5];
strcpy(boardstr,"");
boardstr[0] = 0;
for (int i = 0; i < TS->maxBoards(); i++) {
size_t chleft = sizeof boardstr - strlen(boardstr) - 1;
if (activeboards & (1 << i)) {
sprintf(instr," %d",i);
strcat(boardstr,instr);
snprintf(instr,sizeof instr," %d",i);
strncat(boardstr,instr,chleft);
} else {
strcat(boardstr," .");
strncat(boardstr," .",chleft);
}
}
itsMsgHandler->sendBoardChange(TS->activeBoardsMask());
......
......@@ -78,8 +78,8 @@ void WritefCmd::saveTbbEvent(GCFEvent& event)
setBoard(tbb_event.board);
// copy filename
memcpy(itsFileNameTp,tbb_event.filename_tp,sizeof(char) * 64);
memcpy(itsFileNameMp,tbb_event.filename_mp,sizeof(char) * 64);
memcpy(itsFileNameTp,tbb_event.filename_tp,64);
memcpy(itsFileNameMp,tbb_event.filename_mp,64);
LOG_DEBUG_STR(formatString("TP file: %s",itsFileNameTp));
LOG_DEBUG_STR(formatString("MP file: %s",itsFileNameMp));
......@@ -97,7 +97,7 @@ void WritefCmd::saveTbbEvent(GCFEvent& event)
// print write date and used TP and MP filename
char info[256];
memset(info,0,256);
memset(info,0,sizeof info);
char *tp_name = strrchr(itsFileNameTp,'/');
if (tp_name == 0) {
......@@ -113,7 +113,7 @@ void WritefCmd::saveTbbEvent(GCFEvent& event)
mp_name += 1;
}
sprintf(info," %s %s ",tp_name,mp_name);
snprintf(info,sizeof info," %s %s ",tp_name,mp_name);
LOG_DEBUG_STR(formatString("ImageInfo: %s",info));
int addr = (TS->flashBlocksInImage() - 1) * TS->flashBlockSize();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment