You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by hw...@apache.org on 2011/05/31 23:37:32 UTC

svn commit: r1129928 - /subversion/trunk/subversion/libsvn_repos/log.c

Author: hwright
Date: Tue May 31 21:37:32 2011
New Revision: 1129928

URL: http://svn.apache.org/viewvc?rev=1129928&view=rev
Log:
* subversion/libsvn_repos/log.c
  (handle_merged_revisions): Add an assert which is already implicit in the
    subsequent code.  (Errors are better than crashes.)

Modified:
    subversion/trunk/subversion/libsvn_repos/log.c

Modified: subversion/trunk/subversion/libsvn_repos/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/log.c?rev=1129928&r1=1129927&r2=1129928&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/log.c (original)
+++ subversion/trunk/subversion/libsvn_repos/log.c Tue May 31 21:37:32 2011
@@ -1595,6 +1595,7 @@ handle_merged_revisions(svn_revnum_t rev
     SVN_ERR(combine_mergeinfo_path_lists(&combined_list, deleted_mergeinfo,
                                           TRUE, pool));
 
+  SVN_ERR_ASSERT(combined_list != NULL);
   qsort(combined_list->elts, combined_list->nelts,
         combined_list->elt_size, compare_path_list_range);