diff options
author | Luke Chen <luke.chen@mongodb.com> | 2022-01-14 15:04:28 +1100 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-01-14 04:29:57 +0000 |
commit | a37b54f07ca4cc3a057e3e472d8546e6446e58fe (patch) | |
tree | ee94b27c4835ff580caafe1d1c503f86c8a6d158 /src/third_party | |
parent | 2007de02e0145947cd008c52d75d5b2d120339bc (diff) | |
download | mongo-a37b54f07ca4cc3a057e3e472d8546e6446e58fe.tar.gz |
Import wiredtiger: 8a5752fd9c0904de30181404c644410b901a6e51 from branch mongodb-master
ref: 3fd772a321..8a5752fd9c
for: 5.3.0
WT-8486 Don't call memcmp with NULL pointers even if the comparison length is 0
Diffstat (limited to 'src/third_party')
-rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
-rw-r--r-- | src/third_party/wiredtiger/test/csuite/wt3338_partial_update/main.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 6dd9dcebc66..77598d622cf 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": "3fd772a32140d31642c950e719c42f1effb0bd41" + "commit": "8a5752fd9c0904de30181404c644410b901a6e51" } diff --git a/src/third_party/wiredtiger/test/csuite/wt3338_partial_update/main.c b/src/third_party/wiredtiger/test/csuite/wt3338_partial_update/main.c index 2f29065be5f..e3ae228c204 100644 --- a/src/third_party/wiredtiger/test/csuite/wt3338_partial_update/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt3338_partial_update/main.c @@ -121,7 +121,8 @@ compare(WT_ITEM *orig, WT_ITEM *local, WT_ITEM *library) const uint8_t *p, *t; max = WT_MIN(local->size, library->size); - if (local->size != library->size || memcmp(local->data, library->data, local->size) != 0) { + if (local->size != library->size || + (local->size != 0 && memcmp(local->data, library->data, local->size) != 0)) { for (i = 0, p = local->data, t = library->data; i < max; ++i, ++p, ++t) if (*p != *t) break; @@ -133,9 +134,8 @@ compare(WT_ITEM *orig, WT_ITEM *local, WT_ITEM *library) show(orig, "original"); show(local, "local results"); show(library, "library results"); + testutil_assert(false); } - testutil_assert( - local->size == library->size && memcmp(local->data, library->data, local->size) == 0); } /* |