> -----Original Message----- > From: ne...@apache.org [mailto:ne...@apache.org] > Sent: donderdag 22 september 2011 12:54 > To: comm...@subversion.apache.org > Subject: svn commit: r1174051 - in /subversion/trunk/subversion: > libsvn_client/cleanup.c libsvn_subr/dirent_uri.c > > Author: neels > Date: Thu Sep 22 10:53:37 2011 > New Revision: 1174051 > > URL: http://svn.apache.org/viewvc?rev=1174051&view=rev > Log: > Fix a segfault in upgrade code. > * subversion/libsvn_client/cleanup.c (fetch_repos_info): Pass a scratch pool. > * subversion/libsvn_subr/dirent_uri.c (svn_uri__is_child): Assert. > > Modified: > subversion/trunk/subversion/libsvn_client/cleanup.c > subversion/trunk/subversion/libsvn_subr/dirent_uri.c > > Modified: subversion/trunk/subversion/libsvn_client/cleanup.c > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cl > eanup.c?rev=1174051&r1=1174050&r2=1174051&view=diff > ========================================================== > ==================== > --- subversion/trunk/subversion/libsvn_client/cleanup.c (original) > +++ subversion/trunk/subversion/libsvn_client/cleanup.c Thu Sep 22 > 10:53:37 2011 > @@ -88,7 +88,7 @@ fetch_repos_info(const char **repos_root > svn_ra_session_t *ra_session; > > /* The same info is likely to retrieved multiple times (e.g. externals) */ > - if (ri->last_repos && svn_uri__is_child(ri->last_repos, url, NULL)) > + if (ri->last_repos && svn_uri__is_child(ri->last_repos, url, scratch_pool)) > { > *repos_root = apr_pstrdup(result_pool, ri->last_repos); > *repos_uuid = apr_pstrdup(result_pool, ri->last_uuid); > > Modified: subversion/trunk/subversion/libsvn_subr/dirent_uri.c > URL: > http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/dir > ent_uri.c?rev=1174051&r1=1174050&r2=1174051&view=diff > ========================================================== > ==================== > --- subversion/trunk/subversion/libsvn_subr/dirent_uri.c (original) > +++ subversion/trunk/subversion/libsvn_subr/dirent_uri.c Thu Sep 22 > 10:53:37 2011 > @@ -1420,6 +1420,8 @@ svn_uri__is_child(const char *parent_uri > { > const char *relpath; > > + SVN_ERR_ASSERT(pool); /* hysterical raisins. */ > +
Does this function return a svn_error_t*? Bert