[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Crash in TSVN with directory property conflict during update (was Re: Another crash in ra_serf in 1.8.0)

From: Lieven Govaerts <svnlgo_at_mobsol.be>
Date: Sun, 23 Jun 2013 19:22:20 +0200

On Sun, Jun 23, 2013 at 4:29 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 23.06.2013 15:07, Lieven Govaerts wrote:
>> Stefan,
>>
>>
>> this issue is unrelated to ssl tunnelling or authentication, or more
>> in general unrelated to ra_serf.
>>
>> The particular scenario here is a user updating a directory with both
>> local property changes and incoming property changes. Svn then calls
>> TSVN code to check if the user cancelled the action.
>>
>> Looking at the code, I noticed that the wrong baton is passed in the
>> call to TSVN. The attached patch (to a 1.8.x wc) will fix that.
>>
>> I also noticed that svn command-line apparently does not use the
>> cancel_baton, so this code path is never executed in our tests.
>>
>> Can you let us know if this patch fixes the issue for TSVN users?
>
> I've tested your patch and it seems to work. I could reproduce the crash
> using your described scenario. After applying the patch it doesn't crash
> anymore and the debugger also shows that the Cancel() method is called
> correctly.

Ok, committed to trunk in r1495850 and proposed for backport to 1.8.x.

Lieven

> Stefan
>
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest interface to (Sub)version control
> /_/ \_\ http://tortoisesvn.net
Received on 2013-06-23 19:23:17 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.