Author: philip
Date: Thu Jan 24 14:50:27 2013
New Revision: 1438030
URL: http://svn.apache.org/viewvc?rev=1438030&view=rev
Log:
Fix an unitialised memory read identified by valgrind.
* subversion/libsvn_wc/status.c
(internal_status): Don't use node_status when svn_wc__db_read_info
returns an error.
Modified:
subversion/trunk/subversion/libsvn_wc/status.c
Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1438030&r1=1438029&r2=1438030&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Thu Jan 24 14:50:27 2013
@@ -2945,9 +2945,10 @@ internal_status(svn_wc_status3_t **statu
SVN_ERR(stat_wc_dirent_case_sensitive(&dirent, db, local_abspath,
scratch_pool, scratch_pool));
- if (node_status == svn_wc__db_status_not_present
- || node_status == svn_wc__db_status_server_excluded
- || node_status == svn_wc__db_status_excluded)
+ if (node_kind != svn_kind_unknown
+ && (node_status == svn_wc__db_status_not_present
+ || node_status == svn_wc__db_status_server_excluded
+ || node_status == svn_wc__db_status_excluded))
{
node_kind = svn_kind_unknown;
}
