From 73b6311a834fc68a1ffa076c0faa52e16da99b8c Mon Sep 17 00:00:00 2001
From: Peter Howkins <flibble@users.sf.net>
Date: Sat, 31 Mar 2018 00:15:05 +0100
Subject: [PATCH] libDtWidget: Resolve some Coverity warnings

---
 cde/lib/DtWidget/Control.c     |  2 +-
 cde/lib/DtWidget/EditCalls.c   |  6 ++----
 cde/lib/DtWidget/MenuButton.c  |  2 +-
 cde/lib/DtWidget/SearchCalls.c | 30 ++++++++++--------------------
 cde/lib/DtWidget/TitleBox.c    |  2 +-
 5 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/cde/lib/DtWidget/Control.c b/cde/lib/DtWidget/Control.c
index b4a35a64..fa30d1f9 100644
--- a/cde/lib/DtWidget/Control.c
+++ b/cde/lib/DtWidget/Control.c
@@ -2085,7 +2085,7 @@ ReplaceJPDate(char *date, char *jpstr, int wday)
         free(s);
         return;
     }
-    strcpy(abday, nl_langinfo(ABDAY_1 + wday));
+    snprintf(abday, sizeof(abday), "%s", nl_langinfo(ABDAY_1 + wday));
     if((rp = strstr(date, abday)) != NULL) {
         for(i = 0, j = 0, sp = date; date[j] != '\0'; sp++) {
             if(sp == rp) {
diff --git a/cde/lib/DtWidget/EditCalls.c b/cde/lib/DtWidget/EditCalls.c
index 9a9b29ea..0837d1d9 100644
--- a/cde/lib/DtWidget/EditCalls.c
+++ b/cde/lib/DtWidget/EditCalls.c
@@ -304,8 +304,7 @@ SetUndoDeletionState(
 	    strcat(M_deletedText(pPriv), oldUndo);
 	    M_deletionStart(pPriv) = cb->startPos;
         }
-        if(oldUndo != (char *)NULL)
-	    XtFree(oldUndo);
+        XtFree(oldUndo);
     }
     else 
     {
@@ -323,8 +322,7 @@ SetUndoDeletionState(
 	M_insertionLength(pPriv) = 0;
     }
 
-    if( pDeletedText != (char *)NULL )
-      XtFree( pDeletedText );
+    XtFree( pDeletedText );
 } /* SetUndoDeletionState */
 
 /*
diff --git a/cde/lib/DtWidget/MenuButton.c b/cde/lib/DtWidget/MenuButton.c
index 96fbbada..74f98a88 100644
--- a/cde/lib/DtWidget/MenuButton.c
+++ b/cde/lib/DtWidget/MenuButton.c
@@ -961,7 +961,7 @@ Initialize(
 				PopupCallback, (XtPointer)new_w);
 	}
 
-	if (name) XtFree(name);
+	XtFree(name);
 }
 
 
diff --git a/cde/lib/DtWidget/SearchCalls.c b/cde/lib/DtWidget/SearchCalls.c
index ea8ffebe..722cbcb0 100644
--- a/cde/lib/DtWidget/SearchCalls.c
+++ b/cde/lib/DtWidget/SearchCalls.c
@@ -482,8 +482,7 @@ SearchForString(
 	    return (int)pos;
 	}
 
-	if (word  != (char *)NULL)
-	  XtFree(word);
+	XtFree(word);
     }
 
     return -1;
@@ -812,8 +811,7 @@ _DtEditorDialogSearchCB(
         * Find/Change mode
         * Free the existing search string and get the new one.
         */
-       if (M_search_string(pPriv)) 
-           XtFree(M_search_string(pPriv));
+       XtFree(M_search_string(pPriv));
        M_search_string(pPriv) = XmTextFieldGetString( M_findText(pPriv) );
 
        /*
@@ -869,8 +867,7 @@ _DtEditorDialogSearchCB(
           if( pString != (char *)NULL && *pString != (char)'\0' ) 
              _DtEditorSetReplaceSensitivity( pPriv, True );
 
-          if(pString != (char *)NULL)
-   	     XtFree(pString);
+          XtFree(pString);
        }
        else {
 	 /* 
@@ -918,8 +915,7 @@ _DtEditorDialogReplaceCB(
         * Find/Change mode
         * Free the existing Change To string and get the new one.
         */
-       if (M_replace_string(pPriv)) 
-           XtFree(M_replace_string(pPriv));
+       XtFree(M_replace_string(pPriv));
        M_replace_string(pPriv) = XmTextFieldGetString(M_replaceText(pPriv));
 
        DtEditorChange( (Widget)pPriv, (DtEditorChangeValues *)NULL, 
@@ -979,15 +975,13 @@ _DtEditorDialogReplaceAllCB(
         * Find/Change mode
         * Free any existing search string before getting the current one.
         */
-       if (M_search_string(pPriv)) 
-           XtFree(M_search_string(pPriv));
+       XtFree(M_search_string(pPriv));
        M_search_string(pPriv) = XmTextFieldGetString(M_findText(pPriv));
 
        /*
         * Free the existing Change To string and get the new one.
         */
-       if (M_replace_string(pPriv)) 
-           XtFree(M_replace_string(pPriv));
+       XtFree(M_replace_string(pPriv));
        M_replace_string(pPriv) = XmTextFieldGetString(M_replaceText(pPriv));
 
        /* 
@@ -1018,8 +1012,7 @@ _DtEditorDialogReplaceAllCB(
        changeValues.changeTo = XmTextFieldGetString(M_replaceText(pPriv));
        DtEditorChange((Widget)pPriv, &changeValues, DtEDITOR_ALL_OCCURRENCES);
 
-       if( changeValues.changeTo != (char *)NULL )
-	  XtFree( changeValues.changeTo );
+       XtFree( changeValues.changeTo );
 
     }
 
@@ -1061,8 +1054,7 @@ _DtEditorMisspelledSelectCB(
      * Get the selected word for use when the Find or Replace All button
      * is pressed.
      */
-    if (M_misspelled_string(editor)) 
-      XtFree(M_misspelled_string(editor));
+    XtFree(M_misspelled_string(editor));
 
     M_misspelled_string(editor) = 
 	_XmStringUngenerate(cb->item, NULL, XmCHARSET_TEXT, XmCHARSET_TEXT);
@@ -1181,8 +1173,7 @@ _DtEditorFindTextChangedCB(
          */
         defaultButton = M_search_findBtn(editor);
     }
-    if(pString != (char *)NULL)
-	XtFree(pString);
+    XtFree(pString);
 
     /*
      * Set the default button 
@@ -1247,8 +1238,7 @@ _DtEditorReplaceTextChangedCB(
 	  if ( M_misspelled_found(editor) )
             _DtEditorSetReplaceSensitivity(editor, True );
 
-       if(pString != (char *)NULL)
-   	  XtFree(pString);
+       XtFree(pString);
 
       }
 
diff --git a/cde/lib/DtWidget/TitleBox.c b/cde/lib/DtWidget/TitleBox.c
index b76b4295..dc6ca481 100644
--- a/cde/lib/DtWidget/TitleBox.c
+++ b/cde/lib/DtWidget/TitleBox.c
@@ -762,7 +762,7 @@ Redisplay(
 
 /*	Redisplay work area.
 */
-	if (work_area && XmIsGadget (work_area) && XtIsManaged (work_area))
+	if (XmIsGadget (work_area) && XtIsManaged (work_area))
 	{
 		XtExposeProc expose;
 		_DtProcessLock();
-- 
2.25.1