diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2011-06-15 02:31:35 -0500 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2011-06-15 02:31:35 -0500 |
| commit | 157415a9a9589a1e8af28e68c6664d39c34877af (patch) | |
| tree | f5595412452445a4393543bcb89a2f2620f83e79 /vcs-svn/sliding_window.c | |
| parent | vcs-svn: implement text-delta handling (diff) | |
| parent | vcs-svn: cap number of bytes read from sliding view (diff) | |
| download | tgif-157415a9a9589a1e8af28e68c6664d39c34877af.tar.xz | |
Merge branch 'db/delta-applier' into db/text-delta
* db/delta-applier:
vcs-svn: cap number of bytes read from sliding view
test-svn-fe: split off "test-svn-fe -d" into a separate function
Diffstat (limited to 'vcs-svn/sliding_window.c')
| -rw-r--r-- | vcs-svn/sliding_window.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) { |