Author: hwright
Date: Wed Aug 3 22:39:10 2011
New Revision: 1153692
URL: http://svn.apache.org/viewvc?rev=1153692&view=rev
Log:
Merge r1153416 from trunk:
* r1153416
Fix access to uninitialized variable in svn_wc_status3().
Justification:
Unpredicitable behavior on error condition.
Votes:
+1: ivan, rhuijben, philip
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_wc/status.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 3 22:39:10 2011
@@ -54,4 +54,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149539,1149572,1149675,1149701,1149713,1150242,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149539,1149572,1149675,1149701,1149713,1150242,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151911,1152129,1153416
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1153692&r1=1153691&r2=1153692&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Aug 3 22:39:10 2011
@@ -226,10 +226,3 @@ Approved changes:
A repository root at / can cause ra_neon to assert.
Votes:
+1: philip, cmpilato, rhuijben
-
- * r1153416
- Fix access to uninitialized variable in svn_wc_status3().
- Justification:
- Unpredicitable behavior on error condition.
- Votes:
- +1: ivan, rhuijben, philip
Modified: subversion/branches/1.7.x/subversion/libsvn_wc/status.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/status.c?rev=1153692&r1=1153691&r2=1153692&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_wc/status.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_wc/status.c Wed Aug 3 22:39:10
2011
@@ -2464,21 +2464,24 @@ internal_status(svn_wc_status3_t **statu
db, local_abspath,
scratch_pool, scratch_pool);
- if ((err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
- || node_status == svn_wc__db_status_not_present
- || node_status == svn_wc__db_status_server_excluded
- || node_status == svn_wc__db_status_excluded)
+ if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
{
svn_error_clear(err);
node_kind = svn_wc__db_kind_unknown;
-
/* Ensure conflicted is always set, but don't hide tree conflicts
on 'hidden' nodes. */
- if (err)
- conflicted = FALSE;
+ conflicted = FALSE;
+ }
+ else if (err)
+ {
+ return svn_error_trace(err);
+ }
+ else if (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_wc__db_kind_unknown;
}
- else
- SVN_ERR(err);
if (node_kind == svn_wc__db_kind_unknown)
return svn_error_trace(assemble_unversioned(status,
