Revert "simplify recent bug fix"

This reverts commit bbfddaa. the fd will be leaked
distcc · Apr 14, 2019 · 25b7f89 · 25b7f89
1 parent bbfddaa
commit 25b7f89
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/stringmap.c b/src/stringmap.c
@@ -48,13 +48,15 @@ stringmap_t *stringmap_load(const char *filename, int numFinalWordsToMatch)
     char buf[2*PATH_MAX];
     int n;
 
-    fp = fopen(filename, "r");
-    if (!fp)
-        return NULL;
     result = calloc(1, sizeof(*result));
     if (!result)
         return NULL;
     result->numFinalWordsToMatch = numFinalWordsToMatch;
+    fp = fopen(filename, "r");
+    if (!fp) {
+        free(result);
+        return NULL;
+    }
     n=0;
     while (fgets(buf, sizeof(buf), fp))
         n++;