File 0002-make-proxy_stream_close-close-target-strea... of Package libgit2.34826

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-make-proxy_stream_close-close-target-stream-even-on-errors.patch of Package libgit2.34826

From f4835e44a7b578d52cc41bb8d9b7ed1b69121f03 Mon Sep 17 00:00:00 2001
From: Anders Borum <anders@algoritmer.dk>
Date: Tue, 4 Dec 2018 21:48:12 +0100
Subject: [PATCH] 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.
---
 src/filter.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/filter.c b/src/filter.c
index cf8fe7dec08..90cc55198cc 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -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;
 	}

Places

File 0002-make-proxy_stream_close-close-target-stream-even-on-errors.patch of Package libgit2.34826

Places