From 284782d647815ed46b07c6bd2d5c620a8a46869e Mon Sep 17 00:00:00 2001
From: Kadir Can Ozden <101993364+bysiber@users.noreply.github.com>
Date: Mon, 1 Jun 2026 15:27:05 +0300
Subject: [PATCH] Add missing autoreset in Packer.pack_ext_type (#663)

---
 msgpack/_packer.pyx    |  4 ++++
 msgpack/fallback.py    |  4 ++++
 pyproject.toml         |  7 +++++++
 test/test_extension.py | 11 ++++++++++-
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/msgpack/_packer.pyx b/msgpack/_packer.pyx
index 4d0d2d2..2d92e8a 100644
--- a/msgpack/_packer.pyx
+++ b/msgpack/_packer.pyx
@@ -291,6 +291,10 @@ cdef class Packer:
             raise ValueError("ext data too large")
         msgpack_pack_ext(&self.pk, typecode, len(data))
         msgpack_pack_raw_body(&self.pk, data, len(data))
+        if self.autoreset:
+            buf = PyBytes_FromStringAndSize(self.pk.buf, self.pk.length)
+            self.pk.length = 0
+            return buf
 
     @cython.critical_section
     def pack_array_header(self, long long size):
diff --git a/msgpack/fallback.py b/msgpack/fallback.py
index 1f2daf7..61d77db 100644
--- a/msgpack/fallback.py
+++ b/msgpack/fallback.py
@@ -867,6 +867,10 @@ class Packer:
             self._buffer.write(b"\xc9" + struct.pack(">I", L))
         self._buffer.write(struct.pack("B", typecode))
         self._buffer.write(data)
+        if self._autoreset:
+            ret = self._buffer.getvalue()
+            self._buffer = BytesIO()
+            return ret
 
     def _pack_array_header(self, n):
         if n <= 0x0F:
diff --git a/pyproject.toml b/pyproject.toml
index c69d5a7..4e4510b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,6 +19,7 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
+dependencies = []
 
 [project.urls]
 Homepage = "https://msgpack.org/"
@@ -43,3 +44,9 @@ lint.select = [
     "I", # isort
     #"UP", pyupgrade
 ]
+
+[dependency-groups]
+dev = [
+    "cython>=3.2.5",
+    "pytest>=9.0.3",
+]
diff --git a/test/test_extension.py b/test/test_extension.py
index aaf0fd9..61852f1 100644
--- a/test/test_extension.py
+++ b/test/test_extension.py
@@ -6,7 +6,7 @@ from msgpack import ExtType
 
 def test_pack_ext_type():
     def p(s):
-        packer = msgpack.Packer()
+        packer = msgpack.Packer(autoreset=False)
         packer.pack_ext_type(0x42, s)
         return packer.bytes()
 
@@ -20,6 +20,15 @@ def test_pack_ext_type():
     assert p(b"A" * 0x00012345) == b"\xc9\x00\x01\x23\x45\x42" + b"A" * 0x00012345  # ext 32
 
 
+def test_pack_ext_type_autoreset():
+    packer = msgpack.Packer()
+
+    assert packer.pack_ext_type(0x42, b"A") == b"\xd4\x42A"
+    assert packer.bytes() == b""
+    assert packer.pack_ext_type(0x42, b"ABC") == b"\xc7\x03\x42ABC"
+    assert packer.bytes() == b""
+
+
 def test_unpack_ext_type():
     def check(b, expected):
         assert msgpack.unpackb(b) == expected