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

Posted to commits@subversion.apache.org by st...@apache.org on 2015/07/17 13:37:03 UTC

svn commit: r1691520 - /subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c

Author: stefan2
Date: Fri Jul 17 11:37:02 2015
New Revision: 1691520

URL: http://svn.apache.org/r1691520
Log:
Follow-up to r1689518:
Fix a segfault when --remove-obsoletes wasn't specified.

* tools/client-side/svn-mergeinfo-normalizer/logic.c
  (remove_obsolete_line): Be a no-op without the --remove-obsoletes option.

Found by: Stefan Hett < stefan at egosoft . com >

Modified:
    subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c

Modified: subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
URL: http://svn.apache.org/viewvc/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c?rev=1691520&r1=1691519&r2=1691520&view=diff
==============================================================================
--- subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c (original)
+++ subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c Fri Jul 17 11:37:02 2015
@@ -202,6 +202,9 @@ remove_obsolete_line(svn_boolean_t *dele
                      svn_boolean_t local_only,
                      apr_pool_t *scratch_pool)
 {
+  if (!opt_state->remove_obsoletes)
+    return SVN_NO_ERROR;
+
   SVN_ERR(svn_min__branch_lookup(deleted, lookup, path, local_only,
                                  scratch_pool));
   if (*deleted)