segfault in 1.6.5 when merging

[Stefan Küng <to...@gmail.com>]

Hi,

I'm currently going through the crash dumps sent for TSVN.
There's a segfault in
libsvn_wc\props.c, line 1519

       if (got_conflict)
         *conflict = svn_string_createf
             (pool,
              _("Trying to delete property '%s' with value '%s'\n"
                "but the local value is '%s'."),
              propname, base_val->data, working_val->data);

the segfault happens because 'propname' is NULL, as is base_val and 
working_val.

But I'm not sure if that's the 'real' problem, because the crash dump 
indicates a memory problem (looks like a stack overflow) and in such 
cases the stacktrace and other data isn't very reliable.
Problem is, I now got that same crash in three dumps already.

The line before is in the same file, line 1036:
   SVN_ERR(svn_wc__merge_props(state, adm_access, path, baseprops, NULL, 
NULL,
                               propchanges, base_merge, dry_run,
                               conflict_func, conflict_baton, pool, 
&log_accum));

with 'state' as svn_wc_notify_state_changed, path points to a directory 
in c:\documents and folders\..., propchanges has 'nelts' as 1, 
base_merge is 0, and dry_run is 1.

nothing more upwards in the stack trace which might help, sorry.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2403020