Re: [PATCH] fix crash when merging

On Sun, Jul 13, 2008 at 11:26:53AM +0200, Stefan Küng wrote:
> Stefan Sperling wrote:
> > On Sun, Jul 13, 2008 at 10:39:41AM +0200, Stefan Küng wrote:

> >> 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)
> >
> > Such are the caveats of varargs. Applied in r32080
> > and nominated for backport in r32081.
>
> Thanks!

For the record, I've also grepped our entire tree for calls to
apr_pstrcat and looked at all of them. Turns out we made this
error only in the instance you just fixed.

Stefan