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

Segfault in conflict resolver for binary files

From: Stefan Fuhrmann <stefan.fuhrmann_at_wandisco.com>
Date: Thu, 11 Dec 2014 10:04:05 +0100


It seems that we introduced a bug in the interactive conflict resolver
in 1.8 (and later) that is a regression vs. 1.7. It segfaults on a NULL
pointer for conflicts in binary files.

From what I could find out is that for binary files, the conflict resolver
description doesn't actually set the IS_BINARY flag but that doesn't
seem to be the core problem. Rather, the conflict skel does not provide
a path for the local modification and the MY_ABSPATH element in
the descriptor remains NULL and causes the segfault.

The attached script demonstrates the problem and the .patch file
provided a workaround that is not a proper fix. Select either "df" or
"m" at the 'resolve' prompt.

-- Stefan^2.

Received on 2014-12-11 10:04:36 CET

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