streaming.c: fix a memleak
When stream_blob_to_fd() opens an input stream with a filter, the filter gets discarded upon calling close_istream() before the function returns in the normal case. However, when we fail to open the stream, we failed to discard the filter. By discarding the filter in the failure case, give a consistent life-time rule of the filter to the callers; otherwise the callers need to conditionally discard the filter themselves, and this function does not give enough hint for the caller to do so correctly. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Keeping committed
Mar 30, 2015 at 18:22 UTC
9ce4ad3e0eac33b4cae38ebd76c26ddba2468631
1 file changed
+4
-1
streaming.c
+4
-1
@@ -505,8 +505,11 @@ int stream_blob_to_fd(int fd, unsigned const char *sha1, struct stream_filter *f
505
int result = -1;
506
507
st = open_istream(sha1, &type, &sz, filter);
508
- if (!st)
508
+ if (!st) {
509
+ if (filter)
510
+ free_stream_filter(filter);
511
return result;
512
+ }
513
if (type != OBJ_BLOB)
514
goto close_and_exit;
515
for (;;) {