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 2010/08/31 20:54:51 UTC
svn commit: r991291 - /subversion/trunk/subversion/libsvn_client/patch.c
Author: stsp
Date: Tue Aug 31 18:54:50 2010
New Revision: 991291
URL: http://svn.apache.org/viewvc?rev=991291&view=rev
Log:
* subversion/libsvn_client/patch.c
(get_hunk_info, apply_one_patch, install_patched_prop_targets): Don't
leak errors returned from svn_stream_close().
Modified:
subversion/trunk/subversion/libsvn_client/patch.c
Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=991291&r1=991290&r2=991291&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Tue Aug 31 18:54:50 2010
@@ -1094,7 +1094,7 @@ get_hunk_info(hunk_info_t **hi, patch_ta
SVN_ERR(match_existing_target(&file_matches, content_info, hunk,
stream, scratch_pool));
- svn_stream_close(stream);
+ SVN_ERR(svn_stream_close(stream));
if (file_matches)
{
@@ -1834,9 +1834,9 @@ apply_one_patch(patch_target_t **patch_t
* ### stream to read from. Find a better way to store info on
* ### the existence of the target prop. */
if (prop_content_info->stream)
- svn_stream_close(prop_content_info->stream);
+ SVN_ERR(svn_stream_close(prop_content_info->stream));
- svn_stream_close(prop_content_info->patched);
+ SVN_ERR(svn_stream_close(prop_content_info->patched));
}
@@ -2228,7 +2228,7 @@ install_patched_prop_targets(patch_targe
}
while (! eof);
- svn_stream_close(patched_stream);
+ SVN_ERR(svn_stream_close(patched_stream));
/* If the patch target doesn't exist yet, the patch wants to add an
* empty file with properties set on it. So create an empty file and