diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2021-12-20 13:30:51 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-12-20 02:57:43 +0000 |
| commit | 1440f65c077199a3735d1f21afbf68ccd536c75d (patch) | |
| tree | c99704cedba0e2d1c1c0754bf07de88ff7f38ce4 | |
| parent | 3bbad38dd19e9b5317177c1b650fdbde89e2035f (diff) | |
| download | mongo-1440f65c077199a3735d1f21afbf68ccd536c75d.tar.gz | |
Import wiredtiger: 8e539b739fc7f34a56796c7c36bd55d12c439221 from branch mongodb-master
ref: 807ced11c4..8e539b739f
for: 5.3.0
WT-8577 Fix UBSAN undefined error in schema layer
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/schema/schema_project.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 159f7b145b8..15ec6e75c13 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": "807ced11c405e321e1451e1b291b93271dc6634f" + "commit": "8e539b739fc7f34a56796c7c36bd55d12c439221" } diff --git a/src/third_party/wiredtiger/src/schema/schema_project.c b/src/third_party/wiredtiger/src/schema/schema_project.c index 6a768264d5b..1448c840d0d 100644 --- a/src/third_party/wiredtiger/src/schema/schema_project.c +++ b/src/third_party/wiredtiger/src/schema/schema_project.c @@ -54,16 +54,18 @@ __wt_schema_project_in(WT_SESSION_IMPL *session, WT_CURSOR **cp, const char *pro } else WT_RET(__pack_init(session, &pack, c->key_format)); buf = &c->key; - p = (uint8_t *)buf->data; - end = p + buf->size; + end = p = (uint8_t *)buf->data; + if (end != NULL) + end += buf->size; continue; case WT_PROJ_VALUE: c = cp[arg]; WT_RET(__pack_init(session, &pack, c->value_format)); buf = &c->value; - p = (uint8_t *)buf->data; - end = p + buf->size; + end = p = (uint8_t *)buf->data; + if (end != NULL) + end += buf->size; continue; } |