diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-14 02:37:04 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-14 02:37:04 +0400 |
| commit | fde1cc1dc2631080f45ea55ad8e8cc172a9bd4eb (patch) | |
| tree | 43274be59aee36cd9f0ce84e1a43f402dc8ee03f /vcs-svn/sliding_window.c | |
| parent | 2763aa2ba33e50905a0a2d1232c1d74685608faa (diff) | |
| parent | e32b79cb3211992505d68c421a3f66b29590d72c (diff) | |
Merge branch 'jn/vcs-svn'
vcs-svn updates to clean-up compilation, lift 32-bit limitations, etc.
* jn/vcs-svn:
vcs-svn: allow 64-bit Prop-Content-Length
vcs-svn: suppress a signed/unsigned comparison warning
vcs-svn: suppress a signed/unsigned comparison warning
vcs-svn: suppress signed/unsigned comparison warnings
vcs-svn: use strstr instead of memmem
vcs-svn: use constcmp instead of prefixcmp
vcs-svn: simplify cleanup in apply_one_window
vcs-svn: avoid self-assignment in dummy initialization of pre_off
vcs-svn: drop no-op reset methods
vcs-svn: suppress -Wtype-limits warning
vcs-svn: allow import of > 4GiB files
vcs-svn: rename check_overflow and its arguments for clarity
Diffstat (limited to 'vcs-svn/sliding_window.c')
| -rw-r--r-- | vcs-svn/sliding_window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcs-svn/sliding_window.c b/vcs-svn/sliding_window.c index ec2707c9c4..f11d490995 100644 --- a/vcs-svn/sliding_window.c +++ b/vcs-svn/sliding_window.c @@ -54,7 +54,7 @@ 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) + if (view->max_off >= 0 && view->max_off < off + (off_t) width) return error("delta preimage ends early"); file_offset = view->off + view->buf.len; |