summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2020-09-10 16:25:39 +1000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-09-10 06:42:15 +0000
commitc7efb504fd6fe60580d95fba4b914c85abfc1fd2 (patch)
tree1a79c2bafd0ae4ff45387defbffbaa8608964ec2
parent09ba65f42992265215eb1f9ba123b2dcffdaf860 (diff)
downloadmongo-c7efb504fd6fe60580d95fba4b914c85abfc1fd2.tar.gz
Import wiredtiger: df168fcd373a4afc719f6134f6911a1685178041 from branch mongodb-4.6
ref: bb92ab603f..df168fcd37 for: 4.7.0 WT-6650 Coverity: Null dereferences in session::close
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/src/session/session_api.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 6a630be33db..37622b8cda6 100644
--- a/src/third_party/wiredtiger/import.data
+++ b/src/third_party/wiredtiger/import.data
@@ -2,5 +2,5 @@
"vendor": "wiredtiger",
"github": "wiredtiger/wiredtiger.git",
"branch": "mongodb-4.6",
- "commit": "bb92ab603f22ca84c24af3be7bc9194f44ff3e64"
+ "commit": "df168fcd373a4afc719f6134f6911a1685178041"
}
diff --git a/src/third_party/wiredtiger/src/session/session_api.c b/src/third_party/wiredtiger/src/session/session_api.c
index ac7cef167ff..daee3be92a8 100644
--- a/src/third_party/wiredtiger/src/session/session_api.c
+++ b/src/third_party/wiredtiger/src/session/session_api.c
@@ -267,7 +267,7 @@ __session_close(WT_SESSION *wt_session, const char *config)
SESSION_API_CALL_PREPARE_ALLOWED(session, close, config, cfg);
WT_UNUSED(cfg);
- WT_ERR(__wt_session_close_internal(session));
+ WT_TRET(__wt_session_close_internal(session));
session = NULL;
err: