You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/05/25 12:47:51 UTC
svn commit: r947997 - /subversion/trunk/subversion/libsvn_wc/adm_files.c
Author: julianfoad
Date: Tue May 25 10:47:51 2010
New Revision: 947997
URL: http://svn.apache.org/viewvc?rev=947997&view=rev
Log:
* subversion/libsvn_wc/adm_files.c
(svn_wc__get_pristine_contents): Fix an error leak.
Found by: philipm
Modified:
subversion/trunk/subversion/libsvn_wc/adm_files.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=947997&r1=947996&r2=947997&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Tue May 25 10:47:51 2010
@@ -544,7 +544,7 @@ svn_wc__get_pristine_contents(svn_stream
#else
{
const char *text_base;
- svn_error_t *err;
+ svn_error_t *err, *err2;
err = svn_wc__text_base_path_to_read(&text_base, db, local_abspath,
scratch_pool, scratch_pool);
@@ -560,11 +560,11 @@ svn_wc__get_pristine_contents(svn_stream
if (err->apr_err != SVN_ERR_WC_PATH_UNEXPECTED_STATUS)
return svn_error_return(err);
- SVN_ERR(svn_wc__internal_is_file_external(&file_external,
- db, local_abspath,
- scratch_pool));
- if (!file_external)
- return svn_error_return(err);
+ err2 = svn_wc__internal_is_file_external(&file_external,
+ db, local_abspath,
+ scratch_pool);
+ if (err2 || !file_external)
+ return svn_error_return(svn_error_compose_create(err, err2));
svn_error_clear(err);