From: Jon Trulson <jon@radscan.com>
Date: Sat, 27 Dec 2014 00:23:16 +0000 (-0700)
Subject: dtsession: Coverity (memory corruption, moderate)
X-Git-Tag: 2.2.3~67
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=611dda183149b9f0aa15c41ee5ba3168a19c126a;p=oweals%2Fcde.git

dtsession: Coverity (memory corruption, moderate)
---

diff --git a/cde/programs/dtsession/SmGlobals.c b/cde/programs/dtsession/SmGlobals.c
index 40c87088..9b31be08 100644
--- a/cde/programs/dtsession/SmGlobals.c
+++ b/cde/programs/dtsession/SmGlobals.c
@@ -1255,7 +1255,7 @@ SetFontSavePath(char *langPtr)
         sessionSaved = SM_HOME_FONT_DIRECTORY;
     }
 
-    sprintf(smGD.fontPath, "%s/%s", smGD.savePath, sessionSaved);
+    snprintf(smGD.fontPath, MAXPATHLEN, "%s/%s", smGD.savePath, sessionSaved);
     status = stat(smGD.fontPath, &buf);
     if(status == -1)
     {
@@ -1272,8 +1272,8 @@ SetFontSavePath(char *langPtr)
     /*
      * Now add the lang subdirectory and see if it exists
      */
-    strcat(smGD.fontPath, "/");
-    strcat(smGD.fontPath, langPtr);
+    strncat(smGD.fontPath, "/", MAXPATHLEN);
+    strncat(smGD.fontPath, langPtr, MAXPATHLEN);
     status = stat(smGD.fontPath, &buf);
     if(status == -1)
     {
diff --git a/cde/programs/dtsession/SmRestore.c b/cde/programs/dtsession/SmRestore.c
index 348db9ba..30204800 100644
--- a/cde/programs/dtsession/SmRestore.c
+++ b/cde/programs/dtsession/SmRestore.c
@@ -1815,7 +1815,7 @@ static int
 RestoreClients( void )
 {
     unsigned char *lineP, *string;
-    char *pch, *dispPtr;
+    char *pch, *dispPtr = NULL;
     char *dispEnv, *dispSav, *dispEnvHelpview, *dispSavHelpview;
     unsigned char *hostPtr=NULL, *cmdPtr=NULL, *hintPtr = NULL;
     unsigned char *remoteDisplay;
diff --git a/cde/programs/dtsession/SrvPalette.c b/cde/programs/dtsession/SrvPalette.c
index aef5157d..e6f96e7c 100644
--- a/cde/programs/dtsession/SrvPalette.c
+++ b/cde/programs/dtsession/SrvPalette.c
@@ -726,7 +726,7 @@ convert_selection(
         int *format )
 {
   char pixels[50];
-  int i, screen_number;
+  int i, screen_number = 0;
   char *temp;
   char *str_type_return;
   XrmValue value_return;