mirror of
https://github.com/git/git.git
synced 2024-12-18 06:14:59 +08:00
fbdd4f6fb4
Introduce a "max_off" field in struct sliding_view, roughly representing a maximum number of bytes that can be read from "file". If it is set to a nonnegative integer, a call to move_window() attempting to put the right endpoint beyond that offset will return an error instead. The idea is to use this when applying Subversion-format deltas to prevent reads past the end of the preimage (which has known length). Without such a check, corrupt deltas would cause svn-fe to block indefinitely when data in the input pipe is exhausted. Inspired-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
55 lines
1.3 KiB
C
55 lines
1.3 KiB
C
/*
|
|
* test-svn-fe: Code to exercise the svn import lib
|
|
*/
|
|
|
|
#include "git-compat-util.h"
|
|
#include "vcs-svn/svndump.h"
|
|
#include "vcs-svn/svndiff.h"
|
|
#include "vcs-svn/sliding_window.h"
|
|
#include "vcs-svn/line_buffer.h"
|
|
|
|
static const char test_svnfe_usage[] =
|
|
"test-svn-fe (<dumpfile> | [-d] <preimage> <delta> <len>)";
|
|
|
|
static int apply_delta(int argc, char *argv[])
|
|
{
|
|
struct line_buffer preimage = LINE_BUFFER_INIT;
|
|
struct line_buffer delta = LINE_BUFFER_INIT;
|
|
struct sliding_view preimage_view = SLIDING_VIEW_INIT(&preimage, -1);
|
|
|
|
if (argc != 5)
|
|
usage(test_svnfe_usage);
|
|
|
|
if (buffer_init(&preimage, argv[2]))
|
|
die_errno("cannot open preimage");
|
|
if (buffer_init(&delta, argv[3]))
|
|
die_errno("cannot open delta");
|
|
if (svndiff0_apply(&delta, (off_t) strtoull(argv[4], NULL, 0),
|
|
&preimage_view, stdout))
|
|
return 1;
|
|
if (buffer_deinit(&preimage))
|
|
die_errno("cannot close preimage");
|
|
if (buffer_deinit(&delta))
|
|
die_errno("cannot close delta");
|
|
buffer_reset(&preimage);
|
|
strbuf_release(&preimage_view.buf);
|
|
buffer_reset(&delta);
|
|
return 0;
|
|
}
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
if (argc == 2) {
|
|
if (svndump_init(argv[1]))
|
|
return 1;
|
|
svndump_read(NULL);
|
|
svndump_deinit();
|
|
svndump_reset();
|
|
return 0;
|
|
}
|
|
|
|
if (argc >= 2 && !strcmp(argv[1], "-d"))
|
|
return apply_delta(argc, argv);
|
|
usage(test_svnfe_usage);
|
|
}
|