4 files changed, 11 insertions, 5 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index b83fecf5129..c9d8755e633 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": "8008c405d627cdca8110969a0155fb05e21ac42e"
+    "commit": "9aefe6512018c229358e916f6e5f52f2784ba17f"
 }
diff --git a/src/third_party/wiredtiger/src/cursor/cur_hs.c b/src/third_party/wiredtiger/src/cursor/cur_hs.c
index 2cda35a44ff..d62f7be606f 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_hs.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_hs.c
@@ -322,6 +322,7 @@ __curhs_set_key(WT_CURSOR *cursor, ...)
 {
     WT_CURSOR *file_cursor;
     WT_CURSOR_HS *hs_cursor;
+    WT_DECL_RET;
     WT_ITEM *datastore_key;
     WT_SESSION_IMPL *session;
     wt_timestamp_t start_ts;
@@ -345,8 +346,9 @@ __curhs_set_key(WT_CURSOR *cursor, ...)
     F_SET(hs_cursor, WT_HS_CUR_BTREE_ID_SET);
     if (arg_count > 1) {
         datastore_key = va_arg(ap, WT_ITEM *);
-        WT_IGNORE_RET(__wt_buf_set(
-          session, hs_cursor->datastore_key, datastore_key->data, datastore_key->size));
+        if ((ret = __wt_buf_set(
+               session, hs_cursor->datastore_key, datastore_key->data, datastore_key->size)) != 0)
+            WT_IGNORE_RET(__wt_panic(session, ret, "failed to set the contents of buffer"));
         F_SET(hs_cursor, WT_HS_CUR_KEY_SET);
     } else {
         hs_cursor->datastore_key->data = NULL;
diff --git a/src/third_party/wiredtiger/src/cursor/cur_std.c b/src/third_party/wiredtiger/src/cursor/cur_std.c
index 0c7bbfb6f02..c884aec790f 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_std.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_std.c
@@ -281,10 +281,12 @@ __wt_cursor_get_key(WT_CURSOR *cursor, ...)
 void
 __wt_cursor_set_key(WT_CURSOR *cursor, ...)
 {
+    WT_DECL_RET;
     va_list ap;
 
     va_start(ap, cursor);
-    WT_IGNORE_RET(__wt_cursor_set_keyv(cursor, cursor->flags, ap));
+    if ((ret = __wt_cursor_set_keyv(cursor, cursor->flags, ap)) != 0)
+        WT_IGNORE_RET(__wt_panic(CUR2S(cursor), ret, "failed to set key"));
     va_end(ap);
 }
 
diff --git a/src/third_party/wiredtiger/src/cursor/cur_table.c b/src/third_party/wiredtiger/src/cursor/cur_table.c
index c456ae06888..0f46dc341e4 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_table.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_table.c
@@ -218,6 +218,7 @@ __wt_curtable_set_key(WT_CURSOR *cursor, ...)
 {
     WT_CURSOR **cp, *primary;
     WT_CURSOR_TABLE *ctable;
+    WT_DECL_RET;
     u_int i;
     va_list ap;
 
@@ -226,7 +227,8 @@ __wt_curtable_set_key(WT_CURSOR *cursor, ...)
     primary = *cp++;
 
     va_start(ap, cursor);
-    WT_IGNORE_RET(__wt_cursor_set_keyv(primary, cursor->flags, ap));
+    if ((ret = __wt_cursor_set_keyv(primary, cursor->flags, ap)) != 0)
+        WT_IGNORE_RET(__wt_panic(CUR2S(cursor), ret, "failed to set key"));
     va_end(ap);
 
     if (!F_ISSET(primary, WT_CURSTD_KEY_SET))