svn commit: r1489790 - in /subversion/branches/1.7.x: ./ STATUS subversion/libsvn_wc/tree_conflicts.c

[rh...@apache.org]

Author: rhuijben
Date: Wed Jun  5 10:14:41 2013
New Revision: 1489790

URL: http://svn.apache.org/r1489790
Log:
Revert r148969, which merged r1488878.

This patch caused a compilation problem which made me review my original
review:
  The patch fixes a problem that doesn't exist on 1.7.x and actually
  applies to a completely different (but related) function.
  
* STATUS:
    Change my vote into a veto.

Modified:
    subversion/branches/1.7.x/   (props changed)
    subversion/branches/1.7.x/STATUS
    subversion/branches/1.7.x/subversion/libsvn_wc/tree_conflicts.c

Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
  Reverse-merged /subversion/trunk:r1488878

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1489790&r1=1489789&r2=1489790&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Jun  5 10:14:41 2013
@@ -188,5 +188,15 @@ Veto-blocked changes:
                    this is about err->message which is valid in all builds)
      -1: stsp (not a bug fix, changes output in a patch release)
 
+ * r1488878
+   Don't leave return value uninitialised.
+   Justification:
+     Possible SEGV when using legacy status API.
+   Votes:
+     +1: philip, brane
+     -1: rhuijben (This issue doesn't affect 1.7.x. The patch accidentally
+                   applies to a similar enough function for us not to notice
+                   the problem while reviewing)
+
 Approved changes:
 =================

Modified: subversion/branches/1.7.x/subversion/libsvn_wc/tree_conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/tree_conflicts.c?rev=1489790&r1=1489789&r2=1489790&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/tree_conflicts.c Wed Jun  5 10:14:41 2013
@@ -458,7 +458,5 @@ svn_wc__get_all_tree_conflicts(apr_hash_
       apr_hash_set(*tree_conflicts, abspath, APR_HASH_KEY_STRING, conflict);
     }
 
-
-  *tree_conflict = NULL;
   return SVN_NO_ERROR;
 }