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

[PATCH] fix kwallet-related crash when solving conflicts

From: Lekensteyn <lekensteyn_at_gmail.com>
Date: Thu, 13 Dec 2012 00:04:18 +0100

Hi,

I experienced a segfault when trying to resolve a conflict while updating:
Conflict discovered in 'somefile'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: l
Process '/path/to/shell-script/merge-cmd' failed (exitwhy 6)

Further debugging revealed that a child process of svn segfaults and that this
happens because of misuse of apr_pool_cleanup_register. That function does not
accept null helpers. I've grepped the svn repo and the kwallet auth code is
the only place where this error occurs.

Please see the attached patch, it was based on r1421011 and tested by applying
it on top of 1.7.7.

Regards,
Peter

Received on 2012-12-13 07:09:03 CET

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