From bf266ee14bf11ec3c8b2bf046e00885a07b98b3c Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Thu, 23 Dec 2021 19:49:54 +0000 Subject: [PATCH] dtstyle: Resolve format-overflow issues --- cde/programs/dtstyle/Audio.c | 4 ++-- cde/programs/dtstyle/ColorEdit.c | 4 ++-- cde/programs/dtstyle/ColorMain.c | 8 ++++---- cde/programs/dtstyle/Dtwm.c | 8 ++++---- cde/programs/dtstyle/Font.c | 4 ++-- cde/programs/dtstyle/I18nMain.c | 8 ++++---- cde/programs/dtstyle/Keyboard.c | 4 ++-- cde/programs/dtstyle/MainWin.c | 4 ++-- cde/programs/dtstyle/Mouse.c | 6 +++--- cde/programs/dtstyle/Screen.c | 4 ++-- cde/programs/dtstyle/Startup.c | 4 ++-- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cde/programs/dtstyle/Audio.c b/cde/programs/dtstyle/Audio.c index c22522247..cf120a778 100644 --- a/cde/programs/dtstyle/Audio.c +++ b/cde/programs/dtstyle/Audio.c @@ -714,8 +714,8 @@ saveAudio( x -= vendorExt->vendor.xOffset; y -= vendorExt->vendor.yOffset; - sprintf(bufr, "%s*audioDlg.x: %d\n", bufr, x); - sprintf(bufr, "%s*audioDlg.y: %d\n", bufr, y); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*audioDlg.x: %d\n", bufr, x); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*audioDlg.y: %d\n", bufr, y); if(-1 == write (fd, bufr, strlen(bufr))) { perror(strerror(errno)); } diff --git a/cde/programs/dtstyle/ColorEdit.c b/cde/programs/dtstyle/ColorEdit.c index f7d69ff88..45ec662df 100644 --- a/cde/programs/dtstyle/ColorEdit.c +++ b/cde/programs/dtstyle/ColorEdit.c @@ -1730,8 +1730,8 @@ saveColorEdit( x -= vendorExt->vendor.xOffset; y -= vendorExt->vendor.yOffset; - sprintf(bufr, "%s*colorEditDlg.x: %d\n", bufr, x); - sprintf(bufr, "%s*colorEditDlg.y: %d\n", bufr, y); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*colorEditDlg.x: %d\n", bufr, x); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*colorEditDlg.y: %d\n", bufr, y); /*any other parameter you want to save goes here*/ if(-1 == write (fd, bufr, strlen(bufr))) { perror(strerror(errno)); diff --git a/cde/programs/dtstyle/ColorMain.c b/cde/programs/dtstyle/ColorMain.c index f9b498797..cb1e00b58 100644 --- a/cde/programs/dtstyle/ColorMain.c +++ b/cde/programs/dtstyle/ColorMain.c @@ -2455,11 +2455,11 @@ saveColor( x -= vendorExt->vendor.xOffset; y -= vendorExt->vendor.yOffset; - sprintf(bufr, "%s*paletteDlg.x: %d\n", bufr, x); - sprintf(bufr, "%s*paletteDlg.y: %d\n", bufr, y); - sprintf(bufr, "%s*paletteDlg.selected_palette: %s\n", bufr, + snprintf(bufr, sizeof(style.tmpBigStr), "%s*paletteDlg.x: %d\n", bufr, x); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*paletteDlg.y: %d\n", bufr, y); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*paletteDlg.selected_palette: %s\n", bufr, pCurrentPalette->name); - sprintf(bufr, "%s*paletteDlg.selected_button: %d\n", bufr, + snprintf(bufr, sizeof(style.tmpBigStr), "%s*paletteDlg.selected_button: %d\n", bufr, selected_button); if(-1 == write (fd, bufr, strlen(bufr))) { perror(strerror(errno)); diff --git a/cde/programs/dtstyle/Dtwm.c b/cde/programs/dtstyle/Dtwm.c index f9c5aebdb..eac57cb3c 100644 --- a/cde/programs/dtstyle/Dtwm.c +++ b/cde/programs/dtstyle/Dtwm.c @@ -982,10 +982,10 @@ saveDtwm( width = XtWidth(style.dtwmDialog); height = XtHeight(style.dtwmDialog); - sprintf(bufr, "%s*dtwmDlg.x: %d\n", bufr, x); - sprintf(bufr, "%s*dtwmDlg.y: %d\n", bufr, y); - sprintf(bufr, "%s*dtwmDlg.width: %d\n", bufr, width); - sprintf(bufr, "%s*dtwmDlg.height: %d\n", bufr, height); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*dtwmDlg.x: %d\n", bufr, x); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*dtwmDlg.y: %d\n", bufr, y); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*dtwmDlg.width: %d\n", bufr, width); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*dtwmDlg.height: %d\n", bufr, height); if(-1 == write (fd, bufr, strlen(bufr))) { perror(strerror(errno)); } diff --git a/cde/programs/dtstyle/Font.c b/cde/programs/dtstyle/Font.c index c4ea13dd0..66678a9ca 100644 --- a/cde/programs/dtstyle/Font.c +++ b/cde/programs/dtstyle/Font.c @@ -754,8 +754,8 @@ saveFonts( x -= vendorExt->vendor.xOffset; y -= vendorExt->vendor.yOffset; - sprintf(bufr, "%s*Fonts.x: %d\n", bufr, x); - sprintf(bufr, "%s*Fonts.y: %d\n", bufr, y); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*Fonts.x: %d\n", bufr, x); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*Fonts.y: %d\n", bufr, y); if(-1 == write (fd, bufr, strlen(bufr))) { perror(strerror(errno)); diff --git a/cde/programs/dtstyle/I18nMain.c b/cde/programs/dtstyle/I18nMain.c index 5e52a2582..03cd14713 100644 --- a/cde/programs/dtstyle/I18nMain.c +++ b/cde/programs/dtstyle/I18nMain.c @@ -1204,10 +1204,10 @@ saveI18n( width = XtWidth(style.i18nDialog); height = XtHeight(style.i18nDialog); - sprintf(bufr, "%s*i18nDlg.x: %d\n", bufr, x); - sprintf(bufr, "%s*i18nDlg.y: %d\n", bufr, y); - sprintf(bufr, "%s*i18nDlg.width: %d\n", bufr, width); - sprintf(bufr, "%s*i18nDlg.height: %d\n", bufr, height); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*i18nDlg.x: %d\n", bufr, x); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*i18nDlg.y: %d\n", bufr, y); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*i18nDlg.width: %d\n", bufr, width); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*i18nDlg.height: %d\n", bufr, height); if(-1 == write (fd, bufr, strlen(bufr))) { perror(strerror(errno)); } diff --git a/cde/programs/dtstyle/Keyboard.c b/cde/programs/dtstyle/Keyboard.c index c67c4cb53..adf444a04 100644 --- a/cde/programs/dtstyle/Keyboard.c +++ b/cde/programs/dtstyle/Keyboard.c @@ -633,8 +633,8 @@ saveKeybd( x -= vendorExt->vendor.xOffset; y -= vendorExt->vendor.yOffset; - sprintf(bufr, "%s*keyboardDlg.x: %d\n", bufr, x); - sprintf(bufr, "%s*keyboardDlg.y: %d\n", bufr, y); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*keyboardDlg.x: %d\n", bufr, x); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*keyboardDlg.y: %d\n", bufr, y); if(-1 == write (fd, bufr, strlen(bufr))) { perror(strerror(errno)); diff --git a/cde/programs/dtstyle/MainWin.c b/cde/programs/dtstyle/MainWin.c index ff9d60cff..eee333720 100644 --- a/cde/programs/dtstyle/MainWin.c +++ b/cde/programs/dtstyle/MainWin.c @@ -784,8 +784,8 @@ saveMain( /* Get and write out the geometry info for our Window */ x = XtX(XtParent(style.mainWindow)); y = XtY(XtParent(style.mainWindow)); - sprintf(bufr, "%s*mainWindow.x: %d\n", bufr, x); - sprintf(bufr, "%s*mainWindow.y: %d\n", bufr, y); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*mainWindow.x: %d\n", bufr, x); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*mainWindow.y: %d\n", bufr, y); if(-1 == write (fd, bufr, strlen(bufr))) { perror(strerror(errno)); diff --git a/cde/programs/dtstyle/Mouse.c b/cde/programs/dtstyle/Mouse.c index 13eb5de5b..6e459a23f 100644 --- a/cde/programs/dtstyle/Mouse.c +++ b/cde/programs/dtstyle/Mouse.c @@ -1502,7 +1502,7 @@ ButtonCB( Bool do_accel, do_thresh; Bool set; char message1[6], message2[50], message3[6], message4[6]; - char pointerStr[70]; + char pointerStr[128]; static char dclickRes[40]; static char enableBtn1Res[40]; int dclick; @@ -1773,8 +1773,8 @@ saveMouse( x -= vendorExt->vendor.xOffset; y -= vendorExt->vendor.yOffset; - sprintf(bufr, "%s*Mouse.x: %d\n", bufr, x); - sprintf(bufr, "%s*Mouse.y: %d\n", bufr, y); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*Mouse.x: %d\n", bufr, x); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*Mouse.y: %d\n", bufr, y); if(-1 == write (fd, bufr, strlen(bufr))) { perror(strerror(errno)); diff --git a/cde/programs/dtstyle/Screen.c b/cde/programs/dtstyle/Screen.c index 0a429d82c..ce25e379a 100644 --- a/cde/programs/dtstyle/Screen.c +++ b/cde/programs/dtstyle/Screen.c @@ -2921,8 +2921,8 @@ saveScreen( x -= vendorExt->vendor.xOffset; y -= vendorExt->vendor.yOffset; - sprintf(bufr, "%s*Screen.x: %d\n", bufr, x); - sprintf(bufr, "%s*Screen.y: %d\n", bufr, y); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*Screen.x: %d\n", bufr, x); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*Screen.y: %d\n", bufr, y); if(-1 == write (fd, bufr, strlen(bufr))) { perror(strerror(errno)); diff --git a/cde/programs/dtstyle/Startup.c b/cde/programs/dtstyle/Startup.c index f1e028590..a31bbf246 100644 --- a/cde/programs/dtstyle/Startup.c +++ b/cde/programs/dtstyle/Startup.c @@ -725,8 +725,8 @@ saveStartup( x -= vendorExt->vendor.xOffset; y -= vendorExt->vendor.yOffset; - sprintf(bufr, "%s*startupDlg.x: %d\n", bufr, x); - sprintf(bufr, "%s*startupDlg.y: %d\n", bufr, y); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*startupDlg.x: %d\n", bufr, x); + snprintf(bufr, sizeof(style.tmpBigStr), "%s*startupDlg.y: %d\n", bufr, y); if(-1 == write (fd, bufr, strlen(bufr))) { perror(strerror(errno));