dtsession/SrvFile_io: fix CID's 88299 and 89441

diff --git a/cde/programs/dtsession/SrvFile_io.c b/cde/programs/dtsession/SrvFile_io.c
index 237722bdebb23e56f54c2a6decc68482a600bfc4..1fa77e54092a0be2dd75687c08d73e63c0d9cc1f 100644 (file)
--- a/cde/programs/dtsession/SrvFile_io.c
+++ b/cde/programs/dtsession/SrvFile_io.c
@@ -228,10 +228,8 @@ char    *palette)
                                                         DEFAULT_PALETTE);
     }
 
-    if (path != NULL)
-        SRV_FREE(path);
-    if (palettePath != NULL)
-        SRV_FREE(palettePath);
+    SRV_FREE(path);
+    SRV_FREE(palettePath);
 
     return (paletteDef);
 
@@ -372,6 +370,7 @@ ReadPaletteFile(
          error_value = 1;
          unlink(palettePath);
          SRV_FREE(fullPath);
+         close(fd);
          return((struct _palette *) NULL);
       }
    }