Author: pburba
Date: Fri Apr 23 18:40:34 2010
New Revision: 937461
URL: http://svn.apache.org/viewvc?rev=937461&view=rev
Log:
Prevent a private mergeinfo function from accepting invalid input and
later tripping a SVN_ERR_ASSERT_NO_RETURN assert.
* subversion/libsvn_subr/mergeinfo.c
(svn_mergeinfo__filter_mergeinfo_by_ranges): SVN_ERR_ASSERT on invalid
input.
Modified:
subversion/trunk/subversion/libsvn_subr/mergeinfo.c
Modified: subversion/trunk/subversion/libsvn_subr/mergeinfo.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=937461&r1=937460&r2=937461&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Fri Apr 23 18:40:34 2010
@@ -1959,6 +1959,10 @@ svn_mergeinfo__filter_mergeinfo_by_range
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
+ SVN_ERR_ASSERT(SVN_IS_VALID_REVNUM(youngest_rev));
+ SVN_ERR_ASSERT(SVN_IS_VALID_REVNUM(oldest_rev));
+ SVN_ERR_ASSERT(oldest_rev < youngest_rev);
+
*filtered_mergeinfo = apr_hash_make(result_pool);
if (mergeinfo)
