From: Jon Trulson <jon@radscan.com>
Date: Wed, 11 Apr 2018 19:53:39 +0000 (-0600)
Subject: dtfile/IconWindow: CID 88242,88702,89030
X-Git-Tag: 2.2.4a~105
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=32e8827cbcfc2d3fa88b004d8909ee797dc8bc20;p=oweals%2Fcde.git

dtfile/IconWindow: CID 88242,88702,89030
---

diff --git a/cde/programs/dtfile/IconWindow.c b/cde/programs/dtfile/IconWindow.c
index f518eab0..79e27573 100644
--- a/cde/programs/dtfile/IconWindow.c
+++ b/cde/programs/dtfile/IconWindow.c
@@ -296,7 +296,7 @@ FileWindowInputCallback(
    FileViewData * fileViewData = NULL;
    Arg args[10];
    DesktopRec * desktopRec;
-   KeySym keysym;
+   KeySym keysym = 0;
    Modifiers modif;
    int offset;
    Boolean found;
@@ -624,8 +624,8 @@ FileWindowInputCallback(
             {
               case osfXK_Delete:
                 {
-                  DtActionArg * action_args;
-                  int arg_count;
+                  DtActionArg * action_args = NULL;
+                  int arg_count = 0;
 
                   if( desktopRec == NULL
                       && file_mgr_rec != NULL )
@@ -669,7 +669,8 @@ FileWindowInputCallback(
                                     action_args, arg_count, NULL, NULL,
                                     trash_dir, True, NULL, NULL );
                   }
-                  _DtFreeActionArgs( action_args, arg_count );
+                  if (action_args && arg_count)
+                      _DtFreeActionArgs( action_args, arg_count );
                 }
                 break;
               case osfXK_Menu: