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/24 15:04:04 UTC
svn commit: r1692499 -
/subversion/branches/svn-mergeinfo-normalizer/tools/client-side/svn-mergeinfo-normalizer/logic.c
Author: stefan2
Date: Fri Jul 24 13:04:04 2015
New Revision: 1692499
URL: http://svn.apache.org/r1692499
Log:
On the svn-mergeinfo-normalizer branch:
Fix undefined behavior if --remove-obsolete wasn't specified.
* tools/client-side/svn-mergeinfo-normalizer/logic.c
(remove_obsolete_line): Always have well-defined return values.
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=1692499&r1=1692498&r2=1692499&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 24 13:04:04 2015
@@ -203,7 +203,10 @@ remove_obsolete_line(svn_boolean_t *dele
apr_pool_t *scratch_pool)
{
if (!opt_state->remove_obsoletes)
- return SVN_NO_ERROR;
+ {
+ *deleted = FALSE;
+ return SVN_NO_ERROR;
+ }
SVN_ERR(svn_min__branch_lookup(deleted, lookup, path, local_only,
scratch_pool));