diff options
| author | Etienne Petrel <etienne.petrel@mongodb.com> | 2022-04-18 09:46:39 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-04-18 15:25:08 +0000 |
| commit | e1c1d01b4b72858a2c0461a9a332ff9d9de551d9 (patch) | |
| tree | 9ed781d5c9c02f104c0b5fbe72de2f2122b22447 | |
| parent | a4aa57a45b9c730acc0a888d0b86a479423ffe87 (diff) | |
| download | mongo-e1c1d01b4b72858a2c0461a9a332ff9d9de551d9.tar.gz | |
Import wiredtiger: 8bf7aee644ba931e48ab3583885438052f5889c0 from branch mongodb-master
ref: 7a7d6bf9ab..8bf7aee644
for: 6.0.0-rc0
WT-9018 Check for null update in __wt_update_serial
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/include/serial_inline.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index addef77d1ec..065eeccd2c1 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": "7a7d6bf9ab40cd5635ee960fac1b21edf118a007" + "commit": "8bf7aee644ba931e48ab3583885438052f5889c0" } diff --git a/src/third_party/wiredtiger/src/include/serial_inline.h b/src/third_party/wiredtiger/src/include/serial_inline.h index 12542c64ac9..c5bfa4e272c 100644 --- a/src/third_party/wiredtiger/src/include/serial_inline.h +++ b/src/third_party/wiredtiger/src/include/serial_inline.h @@ -228,9 +228,8 @@ __wt_update_serial(WT_SESSION_IMPL *session, WT_CURSOR_BTREE *cbt, WT_PAGE *page /* Clear references to memory we now own and must free on error. */ upd = *updp; *updp = NULL; - prev_upd_ts = WT_TS_NONE; - prev_upd_ts = upd->prev_durable_ts; + prev_upd_ts = (upd == NULL) ? WT_TS_NONE : upd->prev_durable_ts; /* * All structure setup must be flushed before the structure is entered into the list. We need a |