Commit c3b2053d by Anders Borum Committed by Edward Thomson

make proxy_stream_close close target stream even on errors

When git_filter_apply_fn callback returns a error while smudging proxy_stream_close
ends up returning without closing the stream. This is turn makes blob_content_to_file
crash as it asserts the stream being closed whether there are errors or not.

Closing the target stream on error fixes this problem.
parent 8ce7272d
......@@ -809,6 +809,7 @@ static int proxy_stream_close(git_writestream *s)
{
struct proxy_stream *proxy_stream = (struct proxy_stream *)s;
git_buf *writebuf;
git_error_state error_state = {0};
int error;
assert(proxy_stream);
......@@ -826,6 +827,11 @@ static int proxy_stream_close(git_writestream *s)
git_buf_sanitize(proxy_stream->output);
writebuf = proxy_stream->output;
} else {
/* close stream before erroring out taking care
* to preserve the original error */
giterr_state_capture(&error_state, error);
proxy_stream->target->close(proxy_stream->target);
giterr_state_restore(&error_state);
return error;
}
......
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