diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2021-06-17 15:47:04 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-06-17 06:09:32 +0000 |
| commit | 95c8bfb407e41e2376e24e07436240e8b574373e (patch) | |
| tree | 63323ebc514fbcebc63ffce69c7f43f61238999a | |
| parent | ea3825fdfc2c39aed7893558c117d05a96707409 (diff) | |
| download | mongo-95c8bfb407e41e2376e24e07436240e8b574373e.tar.gz | |
Import wiredtiger: c2f8ac069a38c5cbeb127560fb01a3e23548a912 from branch mongodb-5.0
ref: 7c3b6258b1..c2f8ac069a
for: 5.1.0
WT-7689 Fix double free in `__curhs_insert`
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/cursor/cur_hs.c | 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 4228fdd7d72..b748fcaeebf 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-5.0", - "commit": "7c3b6258b1188a27656d1b0e3e81feee97cd1bba" + "commit": "c2f8ac069a38c5cbeb127560fb01a3e23548a912" } diff --git a/src/third_party/wiredtiger/src/cursor/cur_hs.c b/src/third_party/wiredtiger/src/cursor/cur_hs.c index 299c06a4fa7..c99a62bf68b 100644 --- a/src/third_party/wiredtiger/src/cursor/cur_hs.c +++ b/src/third_party/wiredtiger/src/cursor/cur_hs.c @@ -939,8 +939,7 @@ __curhs_insert(WT_CURSOR *cursor) /* Insert doesn't maintain a position across calls, clear resources. */ err: - __wt_free(session, hs_tombstone); - __wt_free(session, hs_upd); + __wt_free_update_list(session, &hs_upd); WT_TRET(cursor->reset(cursor)); API_END_RET(session, ret); } |