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

[svn-role]

Author: svn-role
Date: Wed Jun  5 04:00:21 2013
New Revision: 1489697

URL: http://svn.apache.org/r1489697
Log:
Merge r1488878 from trunk:

 * r1488878
   Don't leave return value uninitialised.
   Justification:
     Possible SEGV when using legacy status API.
   Votes:
     +1: philip, brane, rhuijben

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/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1488878

Modified: subversion/branches/1.7.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1489697&r1=1489696&r2=1489697&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Jun  5 04:00:21 2013
@@ -190,10 +190,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1488878
-   Don't leave return value uninitialised.
-   Justification:
-     Possible SEGV when using legacy status API.
-   Votes:
-     +1: philip, brane, rhuijben

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=1489697&r1=1489696&r2=1489697&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 
04:00:21 2013
@@ -458,5 +458,7 @@ 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;
 }