You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/02/04 22:34:19 UTC
svn commit: r1442380 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: rhuijben
Date: Mon Feb 4 21:34:19 2013
New Revision: 1442380
URL: http://svn.apache.org/viewvc?rev=1442380&view=rev
Log:
* subversion/libsvn_client/merge.c
(merge_node_absent): Resolve theoretical error leak.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1442380&r1=1442379&r2=1442380&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Feb 4 21:34:19 2013
@@ -3212,8 +3212,9 @@ merge_node_absent(const char *relpath,
const char *local_abspath = svn_dirent_join(merge_b->target->abspath,
relpath, scratch_pool);
- record_skip(merge_b, local_abspath, svn_node_unknown,
- svn_wc_notify_skip, svn_wc_notify_state_missing, scratch_pool);
+ SVN_ERR(record_skip(merge_b, local_abspath, svn_node_unknown,
+ svn_wc_notify_skip, svn_wc_notify_state_missing,
+ scratch_pool));
return SVN_NO_ERROR;
}