diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2022-06-22 21:14:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-22 21:14:43 -0400 |
| commit | 3847522e86e9c65be674f1372cefefdbfbe9ba2b (patch) | |
| tree | 1f46463f4a7c3d74dd263137d8a50021c3d99d8e | |
| parent | f98dd5438f8d7bfd557b612fdf1605b1c3fb8eaf (diff) | |
| parent | f887fd60783ff989d4325de70c2c9fbc2ad73994 (diff) | |
| download | libgit2-3847522e86e9c65be674f1372cefefdbfbe9ba2b.tar.gz | |
Merge pull request #6303 from zawata/legacy_buffer_stream_segfault
filter: Fix Segfault
| -rw-r--r-- | src/libgit2/filter.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/libgit2/filter.c b/src/libgit2/filter.c index 20b215729..80a3cae67 100644 --- a/src/libgit2/filter.c +++ b/src/libgit2/filter.c @@ -893,6 +893,17 @@ static int buffered_stream_write( return git_str_put(&buffered_stream->input, buffer, len); } +#ifndef GIT_DEPRECATE_HARD +# define BUF_TO_STRUCT(b, s) \ + (b)->ptr = (s)->ptr; \ + (b)->size = (s)->size; \ + (b)->reserved = (s)->asize; +# define STRUCT_TO_BUF(s, b) \ + (s)->ptr = (b)->ptr; \ + (s)->size = (b)->size; \ + (s)->asize = (b)->reserved; +#endif + static int buffered_stream_close(git_writestream *s) { struct buffered_stream *buffered_stream = (struct buffered_stream *)s; @@ -902,6 +913,25 @@ static int buffered_stream_close(git_writestream *s) GIT_ASSERT_ARG(buffered_stream); +#ifndef GIT_DEPRECATE_HARD + if (buffered_stream->write_fn == NULL) { + git_buf legacy_output = GIT_BUF_INIT, + legacy_input = GIT_BUF_INIT; + + BUF_TO_STRUCT(&legacy_output, buffered_stream->output); + BUF_TO_STRUCT(&legacy_input, &buffered_stream->input); + + error = buffered_stream->legacy_write_fn( + buffered_stream->filter, + buffered_stream->payload, + &legacy_output, + &legacy_input, + buffered_stream->source); + + STRUCT_TO_BUF(buffered_stream->output, &legacy_output); + STRUCT_TO_BUF(&buffered_stream->input, &legacy_input); + } else +#endif error = buffered_stream->write_fn( buffered_stream->filter, buffered_stream->payload, |