From c7efb504fd6fe60580d95fba4b914c85abfc1fd2 Mon Sep 17 00:00:00 2001 From: Luke Chen Date: Thu, 10 Sep 2020 16:25:39 +1000 Subject: Import wiredtiger: df168fcd373a4afc719f6134f6911a1685178041 from branch mongodb-4.6 ref: bb92ab603f..df168fcd37 for: 4.7.0 WT-6650 Coverity: Null dereferences in session::close --- src/third_party/wiredtiger/import.data | 2 +- src/third_party/wiredtiger/src/session/session_api.c | 2 +- 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: -- cgit v1.2.1