Re: Status of the svn remote helper project (Nov 2010, #2)

From: David Barr <david.barr@cordelta.com>
Date: Nov 22, 2010, 02:06 UTC
Message-ID: <201011221306.45096.david.barr@cordelta.com>
In-Reply-To: <20101121230613.GA24397@burratino>

Hi,

Show 10 quoted lines

> >> A delta in r36 of <http://svn.apache.org/repos/asf> does not apply
> >> with this brand of svn-fe.
> >
> > That's odd, I was able to import up to r354 before receiving:
> > fatal: missing newline after cat-blob response
> 
> Apparently sometimes deltas use the whole preimage and sometimes they
> don't.
> 
> Here's a fix (still needs a simple reproduction script).

I'm testing this path along with the following changes. The first just removes a compile-time warning. The second fixes a memory leak. Sorry, my send-email-fu is not up to scratch.

Signed-off-by: David Barr <david.barr@cordelta.com>
---

diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c
index 02456cf..a95a5c9 100644
--- a/vcs-svn/fast_export.c
+++ b/vcs-svn/fast_export.c
@@ -127,7 +127,6 @@ static long apply_delta(uint32_t mark, off_t len, struct 
line_buffer *input,
                die("cannot open temporary file for blob retrieval");
        if (old_mark) {
                const char *response;
-               off_t dummy;
                printf("cat-blob :%"PRIu32"\n", old_mark);
                fflush(stdout);
                response = get_response_line();
@@ -147,6 +146,7 @@ static long apply_delta(uint32_t mark, off_t len, struct 
line_buffer *input,
        ret = buffer_tmpfile_prepare_to_read(&postimage);
        if (ret < 0)
                die("cannot read temporary file for blob retrieval");
+       strbuf_release(&preimage.buf);
        return ret;
 }