Merge branch 'jc/checkout-out-of-unborn'

diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c
index 3efde20a0cac6309e51a51745be8919ee63dccde..b823b8519c6dc76aa534e056c44eea7210e716f5 100644 (file)
--- a/vcs-svn/fast_export.c
+++ b/vcs-svn/fast_export.c
@@ -31,6 +31,7 @@ static int init_postimage(void)
 
 void fast_export_init(int fd)
 {
+       first_commit_done = 0;
        if (buffer_fdinit(&report_buffer, fd))
                die_errno("cannot read from file descriptor %d", fd);
 }
@@ -226,15 +227,18 @@ static long apply_delta(off_t len, struct line_buffer *input,
        return ret;
 }
 
-void fast_export_data(uint32_t mode, uint32_t len, struct line_buffer *input)
+void fast_export_data(uint32_t mode, off_t len, struct line_buffer *input)
 {
+       assert(len >= 0);
        if (mode == REPO_MODE_LNK) {
                /* svn symlink blobs start with "link " */
+               if (len < 5)
+                       die("invalid dump: symlink too short for \"link\" prefix");
                len -= 5;
                if (buffer_skip_bytes(input, 5) != 5)
                        die_short_read(input);
        }
-       printf("data %"PRIu32"\n", len);
+       printf("data %"PRIuMAX"\n", (uintmax_t) len);
        if (buffer_copy_bytes(input, len) != len)
                die_short_read(input);
        fputc('\n', stdout);
@@ -296,12 +300,12 @@ int fast_export_ls(const char *path, uint32_t *mode, struct strbuf *dataref)
 
 void fast_export_blob_delta(uint32_t mode,
                                uint32_t old_mode, const char *old_data,
-                               uint32_t len, struct line_buffer *input)
+                               off_t len, struct line_buffer *input)
 {
        long postimage_len;
-       if (len > maximum_signed_value_of_type(off_t))
-               die("enormous delta");
-       postimage_len = apply_delta((off_t) len, input, old_data, old_mode);
+
+       assert(len >= 0);
+       postimage_len = apply_delta(len, input, old_data, old_mode);
        if (mode == REPO_MODE_LNK) {
                buffer_skip_bytes(&postimage, strlen("link "));
                postimage_len -= strlen("link ");