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 2013/07/02 22:19:10 UTC
svn commit: r1499095 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: stsp
Date: Tue Jul 2 20:19:10 2013
New Revision: 1499095
URL: http://svn.apache.org/r1499095
Log:
Fix issue #4388, crash during tree conflict resolution.
* subversion/libsvn_wc/wc_db_update_move.c
(svn_wc__db_resolve_delete_raise_moved_away): Don't deref old_version
unconditionally, as it can be NULL.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1499095&r1=1499094&r2=1499095&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Tue Jul 2 20:19:10 2013
@@ -2395,7 +2395,9 @@ svn_wc__db_resolve_delete_raise_moved_aw
wcroot);
SVN_ERR(svn_wc__db_update_move_list_notify(wcroot,
- old_version->peg_rev,
+ (old_version
+ ? old_version->peg_rev
+ : SVN_INVALID_REVNUM),
(new_version
? new_version->peg_rev
: SVN_INVALID_REVNUM),