debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtpad: resolve warnings due to buffer safety

Browse Source
This commit is contained in:
Peter Howkins
2021-11-25 04:44:30 +00:00
parent 9f8dbf6a6c
commit 0307f6af82
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cde/programs/dtpad/fileIo.c
View File

@@ -314,7 +314,7 @@ AddPound(
if (returnBuf[strlen(returnBuf) - 1] != (char)'#') if (returnBuf[strlen(returnBuf) - 1] != (char)'#')
strcat(returnBuf, "#"); strcat(returnBuf, "#");
} else { } else {
sprintf(returnBuf, "#%s", tempBuf); snprintf(returnBuf, sizeof(returnBuf), "#%s", tempBuf);
if(strlen(returnBuf) && returnBuf[strlen(returnBuf) - 1] != (char)'#') if(strlen(returnBuf) && returnBuf[strlen(returnBuf) - 1] != (char)'#')
strcat(returnBuf, "#"); strcat(returnBuf, "#");
} }

20
cde/programs/dtpad/session.c
View File

@@ -131,10 +131,10 @@ SaveMain(
width = XtWidth(XtParent(pPad->mainWindow)); width = XtWidth(XtParent(pPad->mainWindow));
height = XtHeight(XtParent(pPad->mainWindow)); height = XtHeight(XtParent(pPad->mainWindow));
sprintf(bufr, "%s*mainWindow%d.x: %d\n", bufr, padNum, x); snprintf(bufr, sizeof(bufr), "%s*mainWindow%d.x: %d\n", bufr, padNum, x);
sprintf(bufr, "%s*mainWindow%d.y: %d\n", bufr, padNum, y); snprintf(bufr, sizeof(bufr), "%s*mainWindow%d.y: %d\n", bufr, padNum, y);
sprintf(bufr, "%s*mainWindow%d.width: %d\n", bufr, padNum, width); snprintf(bufr, sizeof(bufr), "%s*mainWindow%d.width: %d\n", bufr, padNum, width);
sprintf(bufr, "%s*mainWindow%d.height: %d\n", bufr, padNum, height); snprintf(bufr, sizeof(bufr), "%s*mainWindow%d.height: %d\n", bufr, padNum, height);
wm_state_atom = XmInternAtom (XtDisplay(pPad->app_shell), "WM_STATE", wm_state_atom = XmInternAtom (XtDisplay(pPad->app_shell), "WM_STATE",
False); False);
@@ -146,27 +146,27 @@ SaveMain(
&nitems, &leftover, (unsigned char **) &wm_state); &nitems, &leftover, (unsigned char **) &wm_state);
/* Write out if iconified our not */ /* Write out if iconified our not */
sprintf(bufr, "%s*mainWindow%d.iconify: ", bufr, padNum); snprintf(bufr, sizeof(bufr), "%s*mainWindow%d.iconify: ", bufr, padNum);
if (wm_state->state == IconicState) if (wm_state->state == IconicState)
sprintf (bufr, "%sTrue\n", bufr); snprintf(bufr, sizeof(bufr), "%sTrue\n", bufr);
else else
sprintf (bufr, "%sFalse\n", bufr); snprintf(bufr, sizeof(bufr), "%sFalse\n", bufr);
if(DtWsmGetWorkspacesOccupied(XtDisplay(pPad->app_shell), if(DtWsmGetWorkspacesOccupied(XtDisplay(pPad->app_shell),
XtWindow(pPad->app_shell), &pWsPresence, XtWindow(pPad->app_shell), &pWsPresence,
&numInfo) == Success) &numInfo) == Success)
{ {
int i; int i;
sprintf(bufr, "%s*mainWindow%d.workspaceList: ", bufr, padNum); snprintf(bufr, sizeof(bufr), "%s*mainWindow%d.workspaceList: ", bufr, padNum);
for(i = 0; i < numInfo; i++) for(i = 0; i < numInfo; i++)
{ {
char *name = XGetAtomName(XtDisplay(pPad->app_shell), char *name = XGetAtomName(XtDisplay(pPad->app_shell),
pWsPresence[i]); pWsPresence[i]);
sprintf(bufr, "%s %s", bufr, name); snprintf(bufr, sizeof(bufr), "%s %s", bufr, name);
XtFree(name); XtFree(name);
} }
sprintf(bufr, "%s\n", bufr); snprintf(bufr, sizeof(bufr), "%s\n", bufr);
XtFree((char *)pWsPresence); XtFree((char *)pWsPresence);
} }