summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2013-11-16 08:16:32 -0500
committerKeith Bostic <keith@wiredtiger.com>2013-11-16 08:16:32 -0500
commita42e61ef187b37c6761f132fec75f772f6d9f097 (patch)
tree06fa487ea6ad6333863355adf5955bcee58deb27
parent3f9607a6ea2611b980b3e4e9e9c414c8edbc8dc9 (diff)
downloadmongo-a42e61ef187b37c6761f132fec75f772f6d9f097.tar.gz
Coverity: Dereference before null check (REVERSE_INULL)
check_after_deref: Null-checking "vs" suggests that it may be null, but it has already been dereferenced on all paths leading to the check.
-rw-r--r--src/btree/bt_vrfy.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/btree/bt_vrfy.c b/src/btree/bt_vrfy.c
index 18104f7d6f4..71146a8a29c 100644
--- a/src/btree/bt_vrfy.c
+++ b/src/btree/bt_vrfy.c
@@ -135,16 +135,14 @@ err: /* Inform the underlying block manager we're done. */
if (ckptbase != NULL)
__wt_meta_ckptlist_free(session, ckptbase);
- if (vs != NULL) {
- /* Wrap up reporting. */
- WT_TRET(__wt_progress(session, NULL, vs->fcnt));
-
- /* Free allocated memory. */
- __wt_scr_free(&vs->max_key);
- __wt_scr_free(&vs->max_addr);
- __wt_scr_free(&vs->tmp1);
- __wt_scr_free(&vs->tmp2);
- }
+ /* Wrap up reporting. */
+ WT_TRET(__wt_progress(session, NULL, vs->fcnt));
+
+ /* Free allocated memory. */
+ __wt_scr_free(&vs->max_key);
+ __wt_scr_free(&vs->max_addr);
+ __wt_scr_free(&vs->tmp1);
+ __wt_scr_free(&vs->tmp2);
return (ret);
}