Author: jamessan Date: Sun Nov 26 07:04:47 2017 New Revision: 1816367 URL: http://svn.apache.org/viewvc?rev=1816367&view=rev Log: * subversion/libsvn_client/conflicts.c (find_modified_rev): Remove unnecessary check for details being NULL, since it has already been dereferenced earlier in the function.
Found by: Coverity <https://scan.coverity.com> (CID: 1357097) 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=1816367&r1=1816366&r2=1816367&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/conflicts.c (original) +++ subversion/trunk/subversion/libsvn_client/conflicts.c Sun Nov 26 07:04:47 2017 @@ -5711,15 +5711,12 @@ find_modified_rev(void *baton, details->children_modified = svn_tristate_true; } - if (details) - { - if (b->node_kind == svn_node_dir && - details->children_modified == svn_tristate_unknown) - details->children_modified = svn_tristate_false; + if (b->node_kind == svn_node_dir && + details->children_modified == svn_tristate_unknown) + details->children_modified = svn_tristate_false; - APR_ARRAY_PUSH(b->edits, struct conflict_tree_incoming_edit_details *) = - details; - } + APR_ARRAY_PUSH(b->edits, struct conflict_tree_incoming_edit_details *) = + details; svn_pool_destroy(iterpool);
