diff options
Diffstat (limited to 'vcs-svn')
| -rw-r--r-- | vcs-svn/fast_export.c | 2 | ||||
| -rw-r--r-- | vcs-svn/sliding_window.c | 2 | ||||
| -rw-r--r-- | vcs-svn/sliding_window.h | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c index 005674d8c1..edc658d4fe 100644 --- a/vcs-svn/fast_export.c +++ b/vcs-svn/fast_export.c @@ -187,7 +187,7 @@ static long apply_delta(off_t len, struct line_buffer *input, { long ret; off_t preimage_len = 0; - struct sliding_view preimage = SLIDING_VIEW_INIT(&report_buffer); + struct sliding_view preimage = SLIDING_VIEW_INIT(&report_buffer, -1); FILE *out; if (init_postimage() || !(out = buffer_tmpfile_rewind(&postimage))) diff --git a/vcs-svn/sliding_window.c b/vcs-svn/sliding_window.c index 1b8d9875ed..1bac7a4c7f 100644 --- a/vcs-svn/sliding_window.c +++ b/vcs-svn/sliding_window.c @@ -54,6 +54,8 @@ int move_window(struct sliding_view *view, off_t off, size_t width) return -1; if (off < view->off || off + width < view->off + view->width) return error("invalid delta: window slides left"); + if (view->max_off >= 0 && view->max_off < off + width) + return error("delta preimage ends early"); file_offset = view->off + view->buf.len; if (off < file_offset) { diff --git a/vcs-svn/sliding_window.h b/vcs-svn/sliding_window.h index ed0bfdd65c..b43a825cba 100644 --- a/vcs-svn/sliding_window.h +++ b/vcs-svn/sliding_window.h @@ -7,10 +7,11 @@ struct sliding_view { struct line_buffer *file; off_t off; size_t width; + off_t max_off; /* -1 means unlimited */ struct strbuf buf; }; -#define SLIDING_VIEW_INIT(input) { (input), 0, 0, STRBUF_INIT } +#define SLIDING_VIEW_INIT(input, len) { (input), 0, 0, (len), STRBUF_INIT } extern int move_window(struct sliding_view *view, off_t off, size_t width); |