You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/07/29 00:27:15 UTC
svn commit: r1152023 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: stsp
Date: Thu Jul 28 22:27:14 2011
New Revision: 1152023
URL: http://svn.apache.org/viewvc?rev=1152023&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_scan_addition): Do not dereference MOVED_FROM_RELPATH
and DELETE_OP_ROOT_RELPATH if scan_deletion() set them to NULL.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1152023&r1=1152022&r2=1152023&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Jul 28 22:27:14 2011
@@ -9442,11 +9442,11 @@ svn_wc__db_scan_addition(svn_wc__db_stat
wcroot->sdb, original_repos_id,
result_pool));
- if (moved_from_abspath)
+ if (moved_from_abspath && moved_from_relpath)
*moved_from_abspath = svn_dirent_join(wcroot->abspath,
moved_from_relpath,
result_pool);
- if (delete_op_root_abspath)
+ if (delete_op_root_abspath && delete_op_root_relpath)
*delete_op_root_abspath = svn_dirent_join(wcroot->abspath,
delete_op_root_relpath,
result_pool);