debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtsession/SmDB: error handling issues (CID 87778, 87926)

Browse Source
This commit is contained in:
Jon Trulson
2014-12-27 15:54:55 -07:00
parent 1148ae8794
commit f14df58edb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cde/programs/dtsession/SmDB.c
View File

@@ -498,7 +498,8 @@ OpenOutputClientDB(char *fileName,
/* Open fileName for writing. */ /* Open fileName for writing. */
if ((outputDB->xrmDBFile = fopen(fileName, "w")) == (FILE *)NULL) if ((outputDB->xrmDBFile = fopen(fileName, "w")) == (FILE *)NULL)
{ {
rename(outputDB->tmpDBFileName, fileName); int rv;
rv = rename(outputDB->tmpDBFileName, fileName);
XtFree(outputDB->xrmDBFileName); XtFree(outputDB->xrmDBFileName);
XtFree(outputDB->tmpDBFileName); XtFree(outputDB->tmpDBFileName);
XtFree((char *)outputDB); XtFree((char *)outputDB);
@@ -705,9 +706,10 @@ CloseClientDB(ClientDB clientDBPtr, Boolean writeDB)
} }
else else
{ {
int rv;
/* Close file and remove it; restore original DB. */ /* Close file and remove it; restore original DB. */
fclose(clientDB->xrmDBFile); fclose(clientDB->xrmDBFile);
rename(clientDB->tmpDBFileName, clientDB->xrmDBFileName); rv = rename(clientDB->tmpDBFileName, clientDB->xrmDBFileName);
} }
XtFree(clientDB->xrmDBFileName); XtFree(clientDB->xrmDBFileName);