svn commit: r1872924 - /subversion/trunk/subversion/libsvn_subr/mergeinfo.c

[julianfoad]

Author: julianfoad
Date: Fri Jan 17 17:38:51 2020
New Revision: 1872924

URL: http://svn.apache.org/viewvc?rev=1872924&view=rev
Log:
Restore a debug-mode assertion; perform additional validation in debug
mode only.

A follow-up to r1872118.

For issue #4840 "Merge assertion failure in svn_sort__array_insert".

* subversion/libsvn_subr/mergeinfo.c
  (rangelist_merge2): Restore a debug-mode assertion.
  (svn_rangelist_merge2): Perform additional validation in debug
    mode only.

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=1872924&r1=1872923&r2=1872924&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Fri Jan 17 17:38:51 2020
@@ -1278,7 +1278,7 @@ rangelist_merge2(svn_rangelist_t *rangel
     }
 
 #ifdef SVN_DEBUG
-  /*SVN_ERR_ASSERT(svn_rangelist__is_canonical(rangelist));*/
+  SVN_ERR_ASSERT(svn_rangelist__is_canonical(rangelist));
 #endif
 
   return SVN_NO_ERROR;
@@ -1308,14 +1308,18 @@ svn_rangelist_merge2(svn_rangelist_t *ra
                      apr_pool_t *result_pool,
                      apr_pool_t *scratch_pool)
 {
-  svn_rangelist_t *rangelist_orig = svn_rangelist_dup(rangelist, scratch_pool);
   svn_error_t *err;
 
+#if SVN_DEBUG
+  svn_rangelist_t *rangelist_orig = svn_rangelist_dup(rangelist, scratch_pool);
+
   SVN_ERR_ASSERT(rangelist_is_sorted(rangelist));
   SVN_ERR_ASSERT(rangelist_is_sorted(chg));
+#endif
 
   err = svn_error_trace(rangelist_merge2(rangelist, chg, result_pool,
                                          scratch_pool));
+#if SVN_DEBUG
   if (err)
     {
       err = svn_error_createf(SVN_ERR_ASSERTION_FAIL, err,
@@ -1334,6 +1338,7 @@ svn_rangelist_merge2(svn_rangelist_t *ra
               rangelist_to_string_debug(chg, scratch_pool),
               rangelist_to_string_debug(rangelist, scratch_pool));
     }
+#endif
 
   return err;
 }