Merge branch 'rs/maint-diff-fd-leak' into maint

* rs/maint-diff-fd-leak: close file on error in read_mmfile()
git-mirror · Dec 26, 2010 · 26517de · 26517de
2 parents c2ed29b + 5fd8981
commit 26517de
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/xdiff-interface.c b/xdiff-interface.c
@@ -212,8 +212,10 @@ int read_mmfile(mmfile_t *ptr, const char *filename)
 		return error("Could not open %s", filename);
 	sz = xsize_t(st.st_size);
 	ptr->ptr = xmalloc(sz ? sz : 1);
-	if (sz && fread(ptr->ptr, sz, 1, f) != 1)
+	if (sz && fread(ptr->ptr, sz, 1, f) != 1) {
+		fclose(f);
 		return error("Could not read %s", filename);
+	}
 	fclose(f);
 	ptr->size = sz;
 	return 0;