Commit 78368f2c authored by Junio C Hamano's avatar Junio C Hamano

open_istream(): do not dereference NULL in the error case

When stream-filter cannot be attached, it is expected to return NULL,
and we should close the stream we opened and signal an error by
returning NULL ourselves from this function.

However, we attempted to dereference that NULL pointer between the
point we detected the error and returned from the function.
Brought-to-attention-by: John Keeping's avatarJohn Keeping <john@keeping.me.uk>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent d954828d
......@@ -152,8 +152,10 @@ struct git_istream *open_istream(const unsigned char *sha1,
if (filter) {
/* Add "&& !is_null_stream_filter(filter)" for performance */
struct git_istream *nst = attach_stream_filter(st, filter);
if (!nst)
if (!nst) {
close_istream(st);
return NULL;
}
st = nst;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment