diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-03-02 17:10:20 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-03-02 06:46:31 +0000 |
| commit | 52a327f4204a1a86275a6c4355657128eb2e7473 (patch) | |
| tree | 2419baf0e7f589465d4dc8974b4abcf9dad6bfa6 /src/third_party | |
| parent | ed3c4580fbc1a4973e2b1b72c16fea1d4ea3c581 (diff) | |
| download | mongo-52a327f4204a1a86275a6c4355657128eb2e7473.tar.gz | |
Import wiredtiger: fa9bb29c1563ed12b23984aa755b112abc50d2c6 from branch mongodb-master
ref: b03e33a46f..fa9bb29c15
for: 6.0.0
WT-8814 Replace null comparison with an assert to avoid implicit dereference of null pointer
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/btree/bt_sync.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 2d8e5c1c454..85f1f832ac1 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-master", - "commit": "b03e33a46f97cd6af338ae78326ba64fc626ee1f" + "commit": "fa9bb29c1563ed12b23984aa755b112abc50d2c6" } diff --git a/src/third_party/wiredtiger/src/btree/bt_sync.c b/src/third_party/wiredtiger/src/btree/bt_sync.c index b5af4541f3b..e7c0e4f3a83 100644 --- a/src/third_party/wiredtiger/src/btree/bt_sync.c +++ b/src/third_party/wiredtiger/src/btree/bt_sync.c @@ -223,7 +223,9 @@ __sync_ref_obsolete_check(WT_SESSION_IMPL *session, WT_REF *ref) if (busy) return (0); - mod = ref->page == NULL ? NULL : ref->page->modify; + WT_ASSERT(session, ref->page != NULL); + mod = ref->page->modify; + if (mod != NULL && mod->rec_result == WT_PM_REC_EMPTY) { tag = "reconciled empty"; |