new file mode 100644
@@ -0,0 +1,267 @@
+From 815dd23f321ae208b6cde5cc01a86571836fc9dd Mon Sep 17 00:00:00 2001
+From: Inada Naoki <songofacandy@gmail.com>
+Date: Fri, 19 Jun 2026 00:13:13 +0900
+Subject: [PATCH] Merge commit from fork
+
+* fix Unpacker crash after unpack failure.
+
+* fixup
+
+CVE: CVE-2026-57585
+Upstream-Status: Backport [https://github.com/msgpack/msgpack-python/commit/2c56ddb5d0025ed481d962c0f5d62d19dec7476d]
+
+Backport Changes:
+- The 1.1.2 unpack_clear() predates nested-frame cleanup from commit
+ 4a077456754a060d2bb14578e03bcb1153d952cc, so the original hunk cannot
+ apply. The final upstream implementation supplies the cleanup needed
+ by this fix; the prerequisite's destructor and leak-test changes are
+ not required.
+- The regression tests use the 1.1.2 exception-test context because the
+ later surrounding tests are absent. Upstream assertions are unchanged.
+- The tarball ships msgpack/_cmsgpack.c, which setup.py compiles
+ directly. The recipe regenerates it from the patched Cython source
+ during do_configure, so the patch contains no generated C changes.
+- New container slots are initialized using the ownership rule from
+ 620b0eb4c89cd72d4098564537624d9dbb2ce141. This prevents skip-error
+ cleanup from using stale references left by an earlier unpack. A
+ regression test covers this sequence.
+- The map-item ownership transfer and callback contract from the same
+ commit prevent cleanup of a key released during string interning. Key
+ and value slots are cleared before the callback, which consumes both
+ references on success and failure. The remaining result, mode and
+ destructor changes are not required by this backport.
+- requirements.txt is absent from the 1.1.2 sdist. Its upstream changes
+ pin Cython 3.2.5 and add pytest; Yocto supplies native Cython 3.2.4
+ and ptest pytest through recipe metadata.
+
+Signed-off-by: Ashishkumar Parmar <asparmar@cisco.com>
+---
+ msgpack/_unpacker.pyx | 8 ++++++--
+ msgpack/unpack.h | 17 +++++++++--------
+ msgpack/unpack_template.h | 38 +++++++++++++++++++++++++++++++++-----
+ test/test_except.py | 38 ++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 86 insertions(+), 15 deletions(-)
+
+diff --git a/msgpack/_unpacker.pyx b/msgpack/_unpacker.pyx
+index 34ff330..ba17be2 100644
+--- a/msgpack/_unpacker.pyx
++++ b/msgpack/_unpacker.pyx
+@@ -53,6 +53,7 @@ cdef extern from "unpack.h":
+ execute_fn unpack_skip
+ execute_fn read_array_header
+ execute_fn read_map_header
++
+ void unpack_init(unpack_context* ctx)
+ object unpack_data(unpack_context* ctx)
+ void unpack_clear(unpack_context* ctx)
+@@ -200,6 +201,7 @@ def unpackb(object packed, *, object object_hook=None, object list_hook=None,
+ if off < buf_len:
+ raise ExtraData(obj, PyBytes_FromStringAndSize(buf+off, buf_len-off))
+ return obj
++
+ unpack_clear(&ctx)
+ if ret == 0:
+ raise ValueError("Unpack failed: incomplete input")
+@@ -469,7 +471,7 @@ cdef class Unpacker:
+ obj = unpack_data(&self.ctx)
+ unpack_init(&self.ctx)
+ return obj
+- elif ret == 0:
++ if ret == 0:
+ if self.file_like is not None:
+ self.read_from_file()
+ continue
+@@ -477,7 +479,9 @@ cdef class Unpacker:
+ raise StopIteration("No more data to unpack.")
+ else:
+ raise OutOfData("No more data to unpack.")
+- elif ret == -2:
++
++ unpack_clear(&self.ctx)
++ if ret == -2:
+ raise FormatError
+ elif ret == -3:
+ raise StackError
+diff --git a/msgpack/unpack.h b/msgpack/unpack.h
+index 58a2f4f..b81f2d4 100644
+--- a/msgpack/unpack.h
++++ b/msgpack/unpack.h
+@@ -190,10 +190,13 @@ static inline int unpack_callback_map(unpack_user* u, unsigned int n, msgpack_un
+ return 0;
+ }
+
++/* Consumes k and v on both success and failure; borrows the container. */
+ static inline int unpack_callback_map_item(unpack_user* u, unsigned int current, msgpack_unpack_object* c, msgpack_unpack_object k, msgpack_unpack_object v)
+ {
+ if (u->strict_map_key && !PyUnicode_CheckExact(k) && !PyBytes_CheckExact(k)) {
+ PyErr_Format(PyExc_ValueError, "%.100s is not allowed for map key when strict_map_key=True", Py_TYPE(k)->tp_name);
++ Py_DECREF(k);
++ Py_DECREF(v);
+ return -1;
+ }
+ if (PyUnicode_CheckExact(k)) {
+@@ -201,19 +204,17 @@ static inline int unpack_callback_map_item(unpack_user* u, unsigned int current,
+ }
+ if (u->has_pairs_hook) {
+ msgpack_unpack_object item = PyTuple_Pack(2, k, v);
+- if (!item)
+- return -1;
+ Py_DECREF(k);
+ Py_DECREF(v);
++ if (!item)
++ return -1;
+ PyList_SET_ITEM(*c, current, item);
+ return 0;
+ }
+- else if (PyDict_SetItem(*c, k, v) == 0) {
+- Py_DECREF(k);
+- Py_DECREF(v);
+- return 0;
+- }
+- return -1;
++ int ret = PyDict_SetItem(*c, k, v);
++ Py_DECREF(k);
++ Py_DECREF(v);
++ return ret;
+ }
+
+ static inline int unpack_callback_map_end(unpack_user* u, msgpack_unpack_object* c)
+diff --git a/msgpack/unpack_template.h b/msgpack/unpack_template.h
+index cce29e7..2c07ae2 100644
+--- a/msgpack/unpack_template.h
++++ b/msgpack/unpack_template.h
+@@ -44,6 +44,13 @@ struct unpack_context {
+ };
+
+
++static inline PyObject* unpack_take_ref(PyObject** slot)
++{
++ PyObject* obj = *slot;
++ *slot = NULL;
++ return obj;
++}
++
+ static inline void unpack_init(unpack_context* ctx)
+ {
+ ctx->cs = CS_HEADER;
+@@ -72,7 +79,14 @@ static inline PyObject* unpack_data(unpack_context* ctx)
+
+ static inline void unpack_clear(unpack_context *ctx)
+ {
+- Py_CLEAR(ctx->stack[0].obj);
++ for (unsigned int i = 0; i < ctx->top; i++) {
++ /* map_key holds a live reference only while waiting for the value */
++ if (ctx->stack[i].ct == CT_MAP_VALUE) {
++ Py_CLEAR(ctx->stack[i].map_key);
++ }
++ Py_CLEAR(ctx->stack[i].obj);
++ }
++ unpack_init(ctx);
+ }
+
+ static inline int unpack_execute(bool construct, unpack_context* ctx, const char* data, Py_ssize_t len, Py_ssize_t* off)
+@@ -123,6 +137,7 @@ static inline int unpack_execute(bool construct, unpack_context* ctx, const char
+
+ #define start_container(func, count_, ct_) \
+ if(top >= MSGPACK_EMBED_STACK_SIZE) { ret = -3; goto _end; } \
++ stack[top].obj = NULL; \
+ if(construct_cb(func)(user, count_, &stack[top].obj) < 0) { goto _failed; } \
+ if((count_) == 0) { obj = stack[top].obj; \
+ if (construct_cb(func##_end)(user, &obj) < 0) { goto _failed; } \
+@@ -192,7 +207,7 @@ static inline int unpack_execute(bool construct, unpack_context* ctx, const char
+ case 0xd5: // fixext 2
+ case 0xd6: // fixext 4
+ case 0xd7: // fixext 8
+- again_fixed_trail_if_zero(ACS_EXT_VALUE,
++ again_fixed_trail_if_zero(ACS_EXT_VALUE,
+ (1 << (((unsigned int)*p) & 0x03))+1,
+ _ext_zero);
+ case 0xd8: // fixext 16
+@@ -335,7 +350,12 @@ _push:
+ c->ct = CT_MAP_VALUE;
+ goto _header_again;
+ case CT_MAP_VALUE:
+- if(construct_cb(_map_item)(user, c->count, &c->obj, c->map_key, obj) < 0) { goto _failed; }
++ if (construct) {
++ if (unpack_callback_map_item(user, c->count, &c->obj,
++ unpack_take_ref(&c->map_key),
++ unpack_take_ref(&obj)) < 0) { goto _failed; }
++ }
++ c->map_key = NULL;
+ if(++c->count == c->size) {
+ obj = c->obj;
+ if (construct_cb(_map_end)(user, &obj) < 0) { goto _failed; }
+@@ -398,10 +418,18 @@ _end:
+ #undef start_container
+
+ static int unpack_construct(unpack_context *ctx, const char *data, Py_ssize_t len, Py_ssize_t *off) {
+- return unpack_execute(1, ctx, data, len, off);
++ int ret = unpack_execute(1, ctx, data, len, off);
++ if (ret == -1) {
++ unpack_clear(ctx);
++ }
++ return ret;
+ }
+ static int unpack_skip(unpack_context *ctx, const char *data, Py_ssize_t len, Py_ssize_t *off) {
+- return unpack_execute(0, ctx, data, len, off);
++ int ret = unpack_execute(0, ctx, data, len, off);
++ if (ret == -1) {
++ unpack_clear(ctx);
++ }
++ return ret;
+ }
+
+ #define unpack_container_header read_array_header
+diff --git a/test/test_except.py b/test/test_except.py
+index b77ac80..3e8da42 100644
+--- a/test/test_except.py
++++ b/test/test_except.py
+@@ -31,6 +31,22 @@ def test_raise_from_object_hook():
+ object_pairs_hook=hook,
+ )
+
++ up = Unpacker(object_hook=hook)
++
++ def up_unpack(x):
++ up.feed(x)
++ return up.unpack()
++
++ raises(DummyException, up_unpack, packb({}))
++ raises(DummyException, up_unpack, packb({"fizz": "buzz"}))
++ raises(DummyException, up_unpack, packb({"fizz": "buzz"}))
++ raises(DummyException, up_unpack, packb({"fizz": {"buzz": "spam"}}))
++ raises(
++ DummyException,
++ up_unpack,
++ packb({"fizz": {"buzz": "spam"}}),
++ )
++
+
+ def test_invalidvalue():
+ incomplete = b"\xd9\x97#DL_" # raw8 - length=0x97
+@@ -61,3 +77,25 @@ def test_strict_map_key():
+ packed = packb(invalid, use_bin_type=True)
+ with raises(ValueError):
+ unpackb(packed, raw=False, strict_map_key=True)
++
++
++def test_unpacker_should_not_crash_after_exception():
++ up = Unpacker() # default: strict_map_key=True
++ up.feed(b"\x83\x73\xc4\x00") # fixmap(3): int key (rejected) + empty bin8
++ try:
++ up.unpack() # ValueError: int is not allowed for map key ...
++ except Exception:
++ pass
++ up.skip() # SIGSEGV (resumes from a corrupt parser context)
++
++
++
++def test_skip_after_prior_container():
++ up = Unpacker(raw=False)
++ up.feed(packb([["cached-value"]]))
++ value = up.unpack()
++ assert value == [["cached-value"]]
++ del value
++ up.feed(b"\x91\x91\xc1")
++ with raises(FormatError):
++ up.skip()
@@ -2,12 +2,19 @@ SUMMARY = "MessagePack (de)serializer"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751"
-inherit pypi python_setuptools_build_meta ptest-python-pytest
+inherit pypi python_setuptools_build_meta ptest-python-pytest cython
PTEST_PYTEST_DIR = "test"
+SRC_URI += "file://CVE-2026-57585.patch"
SRC_URI[sha256sum] = "3b60763c1373dd60f398488069bcdc703cd08a711477b5d480eecc9f9626f47e"
+# Regenerate the sdist's C from the patched Cython source.
+do_configure:prepend() {
+ cd ${S}
+ cython3 msgpack/_cmsgpack.pyx
+}
+
RDEPENDS:${PN}:append:class-target = " \
python3-io \
"