mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'db/delta-applier' into db/text-delta

Browse Source 
* 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
This commit is contained in:
Jonathan Nieder
2011-06-15 02:31:35 -05:00
parent 7a75e661c5 fbdd4f6fb4
commit 157415a9a9
4 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vcs-svn/fast_export.c
View File

@ -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)))

2
vcs-svn/sliding_window.c
View File

@ -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) {

3
vcs-svn/sliding_window.h
View File

@ -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);