diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-01-11 16:22:45 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-01-11 05:52:02 +0000 |
| commit | 4b010ea2850b5813a54631f45a442f141b9e051f (patch) | |
| tree | 05320cba2ee82d3c6b002be63527c73e9868fa10 | |
| parent | e5f2993d820520c30a5d271dc1d818964b8e3eea (diff) | |
| download | mongo-4b010ea2850b5813a54631f45a442f141b9e051f.tar.gz | |
Import wiredtiger: 24ca6b36754f3dce091be92ff13c921012f75a21 from branch mongodb-5.2
ref: 56a33593e8..24ca6b3675
for: 5.2.0-rc5
WT-8636 Add check for zero snprintf buffer size when buffer is NULL
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/os_common/os_fstream.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 917552a1c76..a950372d9ee 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.2", - "commit": "56a33593e8e43853afb04ea4950ca30ea9d8d864" + "commit": "24ca6b36754f3dce091be92ff13c921012f75a21" } diff --git a/src/third_party/wiredtiger/src/os_common/os_fstream.c b/src/third_party/wiredtiger/src/os_common/os_fstream.c index bfdaa400967..2536ec4b566 100644 --- a/src/third_party/wiredtiger/src/os_common/os_fstream.c +++ b/src/third_party/wiredtiger/src/os_common/os_fstream.c @@ -134,8 +134,12 @@ __fstream_printf(WT_SESSION_IMPL *session, WT_FSTREAM *fstr, const char *fmt, va va_copy(ap_copy, ap); if ((p = buf->mem) != NULL) p += buf->size; - WT_ASSERT(session, buf->memsize >= buf->size); space = buf->memsize - buf->size; + + WT_ASSERT(session, buf->memsize >= buf->size); + if (buf->mem == NULL) + WT_ASSERT(session, space == 0); + WT_RET(__wt_vsnprintf_len_set(p, space, &len, fmt, ap_copy)); va_end(ap_copy); |