On Thu, Jan 5, 2012 at 2:37 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> Hi,
>
> From a crash report dump sent for TSVN for an update the attached stack
> trace happened.
>
> libsvn_wc\props.c, svn_wc__merge_props()
> Â Â Â to_val = incoming_change->value
> Â Â Â Â ? svn_string_dup(incoming_change->value, result_pool) : NULL;
> ....
> Â Â Â if (! from_val) Â /* adding a new property */
> Â Â Â Â SVN_ERR(apply_single_prop_add(state, &conflict_remains,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â db, local_abspath,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â left_version, right_version,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â is_dir, actual_props,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â propname, base_val, to_val,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â conflict_func, conflict_baton,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dry_run, result_pool, iterpool));
> and then in apply_single_prop_add():
> ...
> Â Â Â if (svn_string_compare(working_val, new_val))
> crashes, because new_val is NULL.
>
> the property is "svn:mergeinfo".
Hi Stefan,
I saw 'mergeinfo' so took a quick look (happily it has nothing to do
with mergeinfo per se, any property will do ;-)
> Could this happen if someone manually removes the svn:mergeinfo property and
> then the next update (from another working copy) gets the to_val as NULL?
I'm not sure if this is what you mean, but I see one way to replicate
this problem: Create a file external mapping to a file with some
arbitrary property. Remap the same external to a file without that
property. Boom.
I filed an issue (issue #4093) which gives the full replication
recipe. I also added a regression test in r1228340.
Paul
Received on 2012-01-09 16:17:35 CET