Author: pburba Date: Thu Oct 20 17:11:33 2011 New Revision: 1186928 URL: http://svn.apache.org/viewvc?rev=1186928&view=rev Log: Don't rely on the current implementation of svn_ra_get_mergeinfo to avoid a segfault when asking for mergeinfo from a repository which isn't mergeinfo capable.
Suggested by: julianf * subversion/libsvn_client/mergeinfo.c (svn_client__get_repos_mergeinfo_catalog): Return early if we can't get mergeinfo from svn_ra_get_mergeinfo. That API conveniently sets repos_mergeinfo_cat to NULL, but only promises to do so if no mergeinfo is *found*. If it didn't do that we'd have a segfault if the repository was not mergeinfo capable. Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1186928&r1=1186927&r2=1186928&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original) +++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Thu Oct 20 17:11:33 2011 @@ -490,6 +490,7 @@ svn_client__get_repos_mergeinfo_catalog( { svn_error_clear(err); *mergeinfo_cat = NULL; + return SVN_NO_ERROR; } else return svn_error_trace(err);