- After a bug at TRICS I replaced all occurrences of strcpy, strcat, sprintf
by length limited versions wherever appropriate. SKIPPED: psi/el755driv.c psi/faverage.c psi/frame.c psi/lmd200.c psi/polterwrite.c psi/psi.c psi/sanswave.c psi/sinqhmdriv.c psi/termprot.c
This commit is contained in:
20
sinqhmtcl.c
20
sinqhmtcl.c
@ -128,24 +128,24 @@ static int DAQAction(ClientData pData, Tcl_Interp * interp,
|
||||
if (iBin == 1) { /* char's */
|
||||
pPtr = (char *) pBuffer;
|
||||
for (i = 0; i < PaRes.Arg[2].iVal; i++, pPtr++) {
|
||||
sprintf(pNumber, "%d", (int) *pPtr);
|
||||
sprintf(pIndex, "%d", i);
|
||||
snprintf(pNumber,sizeof(pNumber)-1, "%d", (int) *pPtr);
|
||||
snprintf(pIndex,sizeof(pIndex)-1, "%d", i);
|
||||
Tcl_SetVar2(interp, argv[5], pIndex, pNumber, TCL_LEAVE_ERR_MSG);
|
||||
}
|
||||
free(pBuffer);
|
||||
} else if (iBin == 2) {
|
||||
pPtr16 = (SQint16 *) pBuffer;
|
||||
for (i = 0; i < PaRes.Arg[2].iVal; i++, pPtr16++) {
|
||||
sprintf(pNumber, "%d", (int) *pPtr16);
|
||||
sprintf(pIndex, "%d", i);
|
||||
snprintf(pNumber,sizeof(pNumber)-1, "%d", (int) *pPtr16);
|
||||
snprintf(pIndex,sizeof(pIndex)-1, "%d", i);
|
||||
Tcl_SetVar2(interp, argv[5], pIndex, pNumber, TCL_LEAVE_ERR_MSG);
|
||||
}
|
||||
free(pBuffer);
|
||||
} else if (iBin == 4) {
|
||||
pPtr32 = (SQint32 *) pBuffer;
|
||||
for (i = 0; i < PaRes.Arg[2].iVal; i++, pPtr32++) {
|
||||
sprintf(pNumber, "%d", (int) *pPtr32);
|
||||
sprintf(pIndex, "%d", i);
|
||||
snprintf(pNumber,sizeof(pNumber)-1, "%d", (int) *pPtr32);
|
||||
snprintf(pIndex,sizeof(pIndex)-1, "%d", i);
|
||||
Tcl_SetVar2(interp, argv[5], pIndex, pNumber, TCL_LEAVE_ERR_MSG);
|
||||
}
|
||||
free(pBuffer);
|
||||
@ -179,7 +179,7 @@ static int DAQAction(ClientData pData, Tcl_Interp * interp,
|
||||
if (iBin == 1) {
|
||||
pPtr = pBuffer;
|
||||
for (i = 0; i < PaRes.Arg[3].iVal; i++, pPtr++) {
|
||||
sprintf(pIndex, "%d", i);
|
||||
snprintf(pIndex,sizeof(pIndex)-1, "%d", i);
|
||||
pVal = Tcl_GetVar2(interp, argv[5], pIndex, TCL_LEAVE_ERR_MSG);
|
||||
if (pVal) {
|
||||
Tcl_GetInt(interp, pVal, &iVal);
|
||||
@ -189,7 +189,7 @@ static int DAQAction(ClientData pData, Tcl_Interp * interp,
|
||||
} else if (iBin == 2) {
|
||||
pPtr16 = pBuffer;
|
||||
for (i = 0; i < PaRes.Arg[3].iVal; i++, pPtr16++) {
|
||||
sprintf(pIndex, "%d", i);
|
||||
snprintf(pIndex,sizeof(pIndex)-1, "%d", i);
|
||||
pVal = Tcl_GetVar2(interp, argv[5], pIndex, TCL_LEAVE_ERR_MSG);
|
||||
if (pVal) {
|
||||
Tcl_GetInt(interp, pVal, &iVal);
|
||||
@ -199,7 +199,7 @@ static int DAQAction(ClientData pData, Tcl_Interp * interp,
|
||||
} else if (iBin == 4) {
|
||||
pPtr32 = pBuffer;
|
||||
for (i = 0; i < PaRes.Arg[2].iVal; i++, pPtr32++) {
|
||||
sprintf(pIndex, "%d", i);
|
||||
snprintf(pIndex,sizeof(pIndex)-1, "%d", i);
|
||||
pVal = Tcl_GetVar2(interp, argv[5], pIndex, TCL_LEAVE_ERR_MSG);
|
||||
if (pVal) {
|
||||
Tcl_GetInt(interp, pVal, &iVal);
|
||||
@ -478,7 +478,7 @@ static int ControlAction(ClientData pData, Tcl_Interp * interp,
|
||||
Tcl_AppendResult(interp, pBueffel, NULL);
|
||||
return TCL_ERROR;
|
||||
}
|
||||
sprintf(pBueffel,
|
||||
snprintf(pBueffel,sizeof(pBueffel)-1,
|
||||
"Mode = %d, DAQ = %d, Rank = %d, BinWidth = %d, Length = %d, NoClients = %d",
|
||||
iMode, iDaq, iRank, iBin, iLength, iClients);
|
||||
Tcl_AppendResult(interp, pBueffel, NULL);
|
||||
|
Reference in New Issue
Block a user