subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1489700 - in /subversion/branches/1.8.x: ./ STATUS subversion/libsvn_wc/tree_conflicts.c
Date Wed, 05 Jun 2013 04:00:51 GMT
Author: svn-role
Date: Wed Jun  5 04:00:50 2013
New Revision: 1489700

URL: http://svn.apache.org/r1489700
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.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/libsvn_wc/tree_conflicts.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1488878

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1489700&r1=1489699&r2=1489700&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jun  5 04:00:50 2013
@@ -63,13 +63,6 @@ Approved changes:
 # blocking issues.  If in doubt see this link for details:
 # http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
 
- * r1488878
-   Don't leave return value uninitialised.
-   Justification:
-     Possible SEGV when using legacy status API.
-   Votes:
-     +1: philip, brane, rhuijben
-
  * r1488425
    Fix issue 4369, poor serf error message for commit with stolen locks.
    Justification:

Modified: subversion/branches/1.8.x/subversion/libsvn_wc/tree_conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_wc/tree_conflicts.c?rev=1489700&r1=1489699&r2=1489700&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_wc/tree_conflicts.c Wed Jun  5 04:00:50 2013
@@ -506,6 +506,8 @@ svn_wc__get_tree_conflict(const svn_wc_c
           return SVN_NO_ERROR;
         }
     }
+
+  *tree_conflict = NULL;
   return SVN_NO_ERROR;
 }
 



Mime
View raw message