diff options
| author | Andrew Morton <andrew.morton@mongodb.com> | 2023-05-15 21:40:40 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-05-16 02:14:04 +0000 |
| commit | 35598246ab32cf617c44b6afdaf210cd68cf4cb1 (patch) | |
| tree | e82a91e137d1c49bcbbc912ee381c2be2d6ae59e | |
| parent | 889119d0075ff717efa935723ccaa55cc9848b0a (diff) | |
| download | mongo-35598246ab32cf617c44b6afdaf210cd68cf4cb1.tar.gz | |
Import wiredtiger: 572d039366c32c7640e61dac02970d9bfce10adb from branch mongodb-master
ref: 686cea52e6..572d039366
for: 7.1.0-rc0
WT-11057 Fix potential out of bounds read in __wt_session_get_btree_ckpt
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/session/session_dhandle.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 a04df1b55fc..743d8877d7f 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": "686cea52e636f395e8582919fc1e153c5ba1af28" + "commit": "572d039366c32c7640e61dac02970d9bfce10adb" } diff --git a/src/third_party/wiredtiger/src/session/session_dhandle.c b/src/third_party/wiredtiger/src/session/session_dhandle.c index adced86064a..d7062b16151 100644 --- a/src/third_party/wiredtiger/src/session/session_dhandle.c +++ b/src/third_party/wiredtiger/src/session/session_dhandle.c @@ -502,7 +502,7 @@ __wt_session_get_btree_ckpt(WT_SESSION_IMPL *session, const char *uri, const cha * Test for the internal checkpoint name (WiredTigerCheckpoint). Note: must_resolve is true in a * subset of the cases where is_unnamed_ckpt is true. */ - must_resolve = WT_STRING_MATCH(WT_CHECKPOINT, cval.str, cval.len); + must_resolve = cval.len == strlen(WT_CHECKPOINT) && WT_PREFIX_MATCH(cval.str, WT_CHECKPOINT); is_unnamed_ckpt = cval.len >= strlen(WT_CHECKPOINT) && WT_PREFIX_MATCH(cval.str, WT_CHECKPOINT); /* This is the top of a retry loop. */ |