From f14df58edb6768ed2336a70e15637adb56e4ac52 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sat, 27 Dec 2014 15:54:55 -0700 Subject: [PATCH] dtsession/SmDB: error handling issues (CID 87778, 87926) --- cde/programs/dtsession/SmDB.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cde/programs/dtsession/SmDB.c b/cde/programs/dtsession/SmDB.c index 7fa5208f4..b6c0e9aaf 100644 --- a/cde/programs/dtsession/SmDB.c +++ b/cde/programs/dtsession/SmDB.c @@ -498,7 +498,8 @@ OpenOutputClientDB(char *fileName, /* Open fileName for writing. */ if ((outputDB->xrmDBFile = fopen(fileName, "w")) == (FILE *)NULL) { - rename(outputDB->tmpDBFileName, fileName); + int rv; + rv = rename(outputDB->tmpDBFileName, fileName); XtFree(outputDB->xrmDBFileName); XtFree(outputDB->tmpDBFileName); XtFree((char *)outputDB); @@ -705,9 +706,10 @@ CloseClientDB(ClientDB clientDBPtr, Boolean writeDB) } else { + int rv; /* Close file and remove it; restore original DB. */ fclose(clientDB->xrmDBFile); - rename(clientDB->tmpDBFileName, clientDB->xrmDBFileName); + rv = rename(clientDB->tmpDBFileName, clientDB->xrmDBFileName); } XtFree(clientDB->xrmDBFileName);