xmkstemp: UB, close handles correctly

* free tempfile

1 files changed, 10 insertions, 10 deletions

diff --git a/src/lib/core/utils.c b/src/lib/core/utils.c
index 0c6880f..8e48df3 100644
--- a/src/lib/core/utils.c
+++ b/src/lib/core/utils.c
@@ -523,25 +523,25 @@ char *xmkstemp(FILE **fp, const char *mode) {
     snprintf(t_name, sizeof(t_name), "%s/%s", tmpdir, "STASIS.XXXXXX");
 
     fd = mkstemp(t_name);
+    if (fd < 0) {
+        SYSERROR("unable to create temporary file: %s", t_name);
+        return NULL;
+    }
     *fp = fdopen(fd, mode);
     if (!*fp) {
-        // unable to open, die
-        if (fd > 0)
-            close(fd);
-        *fp = NULL;
+        close(fd);
         return NULL;
     }
 
     char *path = strdup(t_name);
     if (!path) {
         // strdup failed, die
-        if (*fp) {
-            // close the file handle
-            fclose(*fp);
-            *fp = NULL;
-        }
-        // fall through. path is NULL.
+        // close the file handle
+        fclose(*fp);
+        *fp = NULL;
+        return NULL;
     }
+
     return path;
 }