Author: jamessan Date: Sun Nov 26 07:12:26 2017 New Revision: 1816368 URL: http://svn.apache.org/viewvc?rev=1816368&view=rev Log: * subversion/libsvn_client/conflicts.c (conflict_tree_get_details_incoming_delete): Check if details is NULL before dereferencing it
Found by: Coverity <https://scan.coverity.com> (CID: 1400672) Modified: subversion/trunk/subversion/libsvn_client/conflicts.c Modified: subversion/trunk/subversion/libsvn_client/conflicts.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1816368&r1=1816367&r2=1816368&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/conflicts.c (original) +++ subversion/trunk/subversion/libsvn_client/conflicts.c Sun Nov 26 07:12:26 2017 @@ -5011,7 +5011,7 @@ conflict_tree_get_details_incoming_delet conflict->tree_conflict_incoming_details = details; - if (details->moves) + if (details && details->moves) SVN_ERR(init_wc_move_targets(details, conflict, ctx, scratch_pool)); return SVN_NO_ERROR;
