diff options
| author | Chenhao Qu <chenhao.qu@mongodb.com> | 2022-11-23 11:39:49 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-11-23 01:09:51 +0000 |
| commit | 48f58b60b414ca216a2ee80361e4bb9d34f556c5 (patch) | |
| tree | 1556d1898f5f6ac5f88ca1f4dbc7b21074f46556 /src/third_party/wiredtiger/src/btree/bt_split.c | |
| parent | 491871e061935feb1ce320bba5bb161f86c45a7c (diff) | |
| download | mongo-48f58b60b414ca216a2ee80361e4bb9d34f556c5.tar.gz | |
Import wiredtiger: 1f5b2ca8f2903ebed5db2880206d68129df948a2 from branch mongodb-master
ref: 55e953e187..1f5b2ca8f2
for: 6.3.0-rc0
WT-10190 Fix null deference in __wt_cell_unpack_safe and disable packing with feature flag
Diffstat (limited to 'src/third_party/wiredtiger/src/btree/bt_split.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/btree/bt_split.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/third_party/wiredtiger/src/btree/bt_split.c b/src/third_party/wiredtiger/src/btree/bt_split.c index 44ade7c1883..a00a66440f7 100644 --- a/src/third_party/wiredtiger/src/btree/bt_split.c +++ b/src/third_party/wiredtiger/src/btree/bt_split.c @@ -245,6 +245,7 @@ __split_ref_move(WT_SESSION_IMPL *session, WT_PAGE *from_home, WT_REF **from_ref if (ref_addr != NULL && !__wt_off_page(from_home, ref_addr)) { __wt_cell_unpack_addr(session, from_home->dsk, (WT_CELL *)ref_addr, &unpack); WT_RET(__wt_calloc_one(session, &addr)); + WT_PAGE_STAT_COPY(&addr->ps, &unpack.ps); WT_TIME_AGGREGATE_COPY(&addr->ta, &unpack.ta); WT_ERR(__wt_memdup(session, unpack.data, unpack.size, &addr->addr)); addr->size = (uint8_t)unpack.size; @@ -1731,6 +1732,7 @@ __wt_multi_to_ref(WT_SESSION_IMPL *session, WT_PAGE *page, WT_MULTI *multi, WT_R if (multi->addr.addr != NULL) { WT_RET(__wt_calloc_one(session, &addr)); ref->addr = addr; + WT_PAGE_STAT_COPY(&addr->ps, &multi->addr.ps); WT_TIME_AGGREGATE_COPY(&addr->ta, &multi->addr.ta); WT_RET(__wt_memdup(session, multi->addr.addr, multi->addr.size, &addr->addr)); addr->size = multi->addr.size; |