Author: stefan2
Date: Mon Aug 3 12:15:54 2015
New Revision: 1693886
URL: http://svn.apache.org/r1693886
Log:
* subversion/libsvn_fs_fs/verify.c
(verify_f7_metadata_consistency): Fix error leak.
Found by: danielsh
Modified:
subversion/trunk/subversion/libsvn_fs_fs/verify.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/verify.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/verify.c?rev=1693886&r1=1693885&r2=1693886&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/verify.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/verify.c Mon Aug 3 12:15:54 2015
@@ -816,8 +816,15 @@ verify_f7_metadata_consistency(svn_fs_t
/* concurrent packing is one of the reasons why verification may fail.
Make sure, we operate on up-to-date information. */
if (err)
- SVN_ERR(svn_fs_fs__read_min_unpacked_rev(&ffd->min_unpacked_rev,
- fs, pool));
+ {
+ svn_error_t *err2
+ = svn_fs_fs__read_min_unpacked_rev(&ffd->min_unpacked_rev,
+ fs, pool);
+
+ /* Be careful to not leak ERR. */
+ if (err2)
+ return svn_error_trace(svn_error_compose_create(err, err2));
+ }
/* retry the whole shard if it got packed in the meantime */
if (err && count != pack_size(fs, revision))
