On Mon, Apr 27, 2009 at 3:32 PM, Russell
Yanofsky<russell.yanofsky_at_videon-central.com> wrote:
> Arthur Shipkowski wrote:
>> I've been observing a segfault during an "svn merge" operation under
>> 1.6.1 (running x86_64 Linux, though I've also reproduced it under 32-bit
>> Linux; the repository in question is has not friendly to Windows for a
>> third comparison).
>>
>> It appears that in find_nearest_ancestor at line 2205, child is getting
>> a NULL pointer out of children_with_mergeinfo even though i is less
>> than nelts. Two lines later it's dereferenced, and the segfault occurs.
>
> Attaching fix for svn 1.6.1. Looks like this is already fixed a
> different way in the trunk.
As Russ said this was fixed another way on trunk, see r36613, r36615,
and r36631. These fixes are included in the recent 1.6.2 release of
Subversion.
Paul
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2360991
Received on 2009-06-10 18:38:05 CEST