Prepare v1.2.2 release

Author: methane

.github/workflows/docs.yaml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Setup Python
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: '3.x'
           cache: "pip"

.github/workflows/lint.yaml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-slim
     steps:
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: ruff check
         run: |

.github/workflows/test.yml

@@ -26,10 +26,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Set up Python
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: ${{ matrix.py }}
           allow-prereleases: true

.github/workflows/test_debug.yml

@@ -11,9 +11,9 @@ jobs:
       PYTHON_VERSION: 3.14.6
     steps:
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
-      - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+      - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: /opt/python-debug
           key: python-debug-${{ runner.os }}-${{ env.PYTHON_VERSION }}

.github/workflows/wheel.yml

@@ -26,8 +26,8 @@ jobs:
     name: Build wheels on ${{ matrix.os }}${{ matrix.name_suffix || '' }}
 
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-      - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
         with:
           python-version: "3.x"
           cache: "pip"
@@ -39,12 +39,12 @@ jobs:
 
       - name: Set up QEMU for emulation
         if: matrix.cibw_archs == 'riscv64'
-        uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4.1.0
+        uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
         with:
           platforms: ${{ matrix.cibw_archs }}
 
       - name: Build
-        uses: pypa/cibuildwheel@294735312765b09d24a2fbec22660ce817587d55 # v4.1.0
+        uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0
         env:
           CIBW_TEST_REQUIRES: "pytest"
           CIBW_TEST_COMMAND: "pytest {package}/test"
@@ -99,6 +99,6 @@ jobs:
           path: dist
           merge-multiple: true
 
-      - uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0
+      - uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33 # v1.14.2
         #with:
         # To test: repository-url: https://test.pypi.org/legacy/

CHANGELOG.md

@@ -5,6 +5,14 @@ Release Date: TBD
 - Fix the `read_size` documentation. #700
 - Fix silent truncation when unpacking an out-of-range timestamp with `timestamp=3`. #701
 - Prevent reentrant calls to `Unpacker.feed()` while unpacking. #704
+- Improve error handling and reporting in unpacking functions. #707
+- Fix `Timestamp.from_datetime()` precision for far-future datetimes. #710
+- Fix typos in the documentation. #712
+- Validate the nanoseconds range when unpacking timestamps in the C extension. #716
+- Fix a use-after-free in the `unpackb()` `ExtraData` path for non-contiguous input. #722
+- Prevent a buffer overflow when converting `Packer`'s `buf_size`. #726
+- Translate `RecursionError` to `StackError` in the fallback `Unpacker.skip()`. #727
+- Raise `OverflowError` when `use_single_float=True` cannot represent a value. #728
 
 
 # 1.2.1

docs/conf.py

@@ -269,7 +269,7 @@
 # The format is a list of tuples containing the path and title.
 # epub_pre_files = []
 
-# HTML files shat should be inserted after the pages created by sphinx.
+# HTML files that should be inserted after the pages created by sphinx.
 # The format is a list of tuples containing the path and title.
 # epub_post_files = []
 

msgpack/__init__.py

@@ -5,7 +5,7 @@
 from .ext import ExtType, Timestamp
 
 version = (1, 2, 2)
-__version__ = "1.2.2rc1"
+__version__ = "1.2.2"
 
 
 if os.environ.get("MSGPACK_PUREPYTHON"):

msgpack/_packer.pyx

@@ -27,7 +27,7 @@ cdef extern from "pack.h":
     int msgpack_pack_false(msgpack_packer* pk) except -1
     int msgpack_pack_long_long(msgpack_packer* pk, long long d) except -1
     int msgpack_pack_unsigned_long_long(msgpack_packer* pk, unsigned long long d) except -1
-    int msgpack_pack_float(msgpack_packer* pk, float d) except -1
+    int msgpack_pack_float(msgpack_packer* pk, double d) except -1
     int msgpack_pack_double(msgpack_packer* pk, double d) except -1
     int msgpack_pack_array(msgpack_packer* pk, size_t l) except -1
     int msgpack_pack_map(msgpack_packer* pk, size_t l) except -1
@@ -110,7 +110,7 @@ cdef class Packer:
     cdef bint autoreset
     cdef bint datetime
 
-    def __cinit__(self, buf_size=256*1024, **_kwargs):
+    def __cinit__(self, size_t buf_size=256*1024, **_kwargs):
         self.pk.buf = <char*> PyMem_Malloc(buf_size)
         if self.pk.buf == NULL:
             raise MemoryError("Unable to allocate internal buffer.")
@@ -179,7 +179,7 @@ cdef class Packer:
                     raise OverflowError("Integer value out of range")
         elif PyFloat_CheckExact(o) if strict else PyFloat_Check(o):
             if self.use_float:
-                msgpack_pack_float(&self.pk, <float>o)
+                msgpack_pack_float(&self.pk, <double>o)
             else:
                 msgpack_pack_double(&self.pk, <double>o)
         elif PyBytesLike_CheckExact(o) if strict else PyBytesLike_Check(o):

msgpack/_unpacker.pyx

@@ -46,7 +46,7 @@ cdef extern from "unpack.h":
         Py_ssize_t count
 
     ctypedef int (*execute_fn)(unpack_context* ctx, const char* data,
-                               Py_ssize_t len, Py_ssize_t* off) except? -1
+                               Py_ssize_t len, Py_ssize_t* off) except -1
     execute_fn unpack_construct
     execute_fn unpack_skip
     execute_fn read_array_header
@@ -190,24 +190,23 @@ def unpackb(object packed, *, object object_hook=None, object list_hook=None,
                  use_list, raw, timestamp, strict_map_key, cerr,
                  max_str_len, max_bin_len, max_array_len, max_map_len, max_ext_len)
         ret = unpack_construct(&ctx, buf, buf_len, &off)
+        if ret == 1:
+            obj = unpack_data(&ctx)
+            if off < buf_len:
+                # buf may point into a temporary contiguous copy owned by view,
+                # so the extra data must be copied out before releasing view.
+                raise ExtraData(obj, PyBytes_FromStringAndSize(buf+off, buf_len-off))
+            return obj
     finally:
         PyBuffer_Release(&view);
 
-    if ret == 1:
-        obj = unpack_data(&ctx)
-        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")
     elif ret == -2:
         raise FormatError
     elif ret == -3:
         raise StackError
-    elif PyErr_Occurred():
-        raise
     else:
         raise ValueError("Unpack failed: error = %d" % (ret,))
 
@@ -502,8 +501,6 @@ cdef class Unpacker:
                     raise FormatError
                 elif ret == -3:
                     raise StackError
-                elif PyErr_Occurred():
-                    raise
                 else:
                     raise ValueError("Unpack failed: error = %d" % (ret,))
         finally: