dtsession/SrvFile_io: fix CID's 88299 and 89441

2014-12-27 20:06:53 -07:00
parent aa2daba4af
commit 722cfc70eb
1 changed files with 3 additions and 4 deletions
--- 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);
      }
   }