[PATCH] fix crash when merging

Hi,

I've received many crash reports for TSVN which indicated a problem when
merging. But the data from the crash dump was not very helpful so it
took me a while to figure out the problem:

In subversion/libsvn_wc/props.c, function get_existing_prop_reject_file
the call to apr_pstrcat() is not correct: as the docs for apr_pstrcat
indicate, the last parameter must be NULL.

The attached patch fixes this problem.

I vote for backporting this to 1.5.x.
(I know my vote doesn't really count :) )

Stefan

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

[[[
* subversion/libsvn_wc/props.c
  (get_existing_prop_reject_file): the last parameter for apr_pstrcat
                                   must be NULL.
]]]
Index: subversion/libsvn_wc/props.c
===================================================================
--- subversion/libsvn_wc/props.c (revision 32079)
+++ subversion/libsvn_wc/props.c (working copy)
@@ -212,7 +212,8 @@
   SVN_ERR(svn_wc__entry_versioned(&entry, path, adm_access, FALSE, pool));
 
   *reject_file = entry->prejfile
- ? apr_pstrcat(pool, svn_wc_adm_access_path(adm_access), entry->prejfile)
+ ? apr_pstrcat(pool, svn_wc_adm_access_path(adm_access),
+ entry->prejfile, NULL)
     : NULL;
   return SVN_NO_ERROR;
 }