Add force_xinerama configuration option

[i3/i3] / src / util.c

diff --git a/src/util.c b/src/util.c
index 1ad43d3f5a431c77ff4e022af479f9b710460d9d..2d6c3e147138d147de2f80dacb5bc1d74b950a67 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -77,7 +77,8 @@ void *scalloc(size_t size) {
 
 void *srealloc(void *ptr, size_t size) {
     void *result = realloc(ptr, size);
-    exit_if_null(result, "Error: out memory (realloc(%zd))\n", size);
+    if (result == NULL && size > 0)
+        die("Error: out memory (realloc(%zd))\n", size);
     return result;
 }
 
@@ -373,11 +374,13 @@ char *store_restart_layout() {
         if (n == -1) {
             perror("write()");
             free(filename);
+            close(fd);
             return NULL;
         }
         if (n == 0) {
             printf("write == 0?\n");
             free(filename);
+            close(fd);
             return NULL;
         }
         written += n;