hiredis 3.4.0.dev0__tar.gz → 3.4.2__tar.gz

{hiredis-3.4.0.dev0/hiredis.egg-info → hiredis-3.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hiredis
-Version: 3.4.0.dev0
+Version: 3.4.2
 Summary: Python wrapper for hiredis
 Home-page: https://github.com/redis/hiredis-py
 Author: Jan-Erik Rediger, Pieter Noordhuis

hiredis-3.4.2/hiredis/version.py

@@ -0,0 +1 @@
+__version__ = "3.4.2"

{hiredis-3.4.0.dev0 → hiredis-3.4.2/hiredis.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hiredis
-Version: 3.4.0.dev0
+Version: 3.4.2
 Summary: Python wrapper for hiredis
 Home-page: https://github.com/redis/hiredis-py
 Author: Jan-Erik Rediger, Pieter Noordhuis

{hiredis-3.4.0.dev0 → hiredis-3.4.2}/hiredis.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ vendor/hiredis/async.h
 vendor/hiredis/async_private.h
 vendor/hiredis/dict.c
 vendor/hiredis/dict.h
+vendor/hiredis/ffc.h
 vendor/hiredis/fmacros.h
 vendor/hiredis/hiredis.c
 vendor/hiredis/hiredis.h

{hiredis-3.4.0.dev0 → hiredis-3.4.2}/src/reader.c

@@ -83,6 +83,10 @@ PyTypeObject PushNotificationType = {
 
 static void *tryParentize(const redisReadTask *task, PyObject *obj) {
     PyObject *parent;
+    if (obj == NULL) {
+        /* The caller failed to allocate; propagate so hiredis reports OOM. */
+        return NULL;
+    }
     if (task && task->parent) {
         parent = (PyObject*)task->parent->obj;
         switch (task->parent->type) {
@@ -242,12 +246,22 @@ static PyObject* PushNotificationType_New(Py_ssize_t size) {
         return NULL;
     }
 
-   int res = PyList_SetSlice(obj, PY_SSIZE_T_MAX, PY_SSIZE_T_MAX, PyList_New(size));
+    /* Pre-sizes the notification, whose elements are filled in as they parse.
+     * PyList_SetSlice does not steal a reference to the list it is handed, so
+     * it has to be released here. */
+    PyObject* items = PyList_New(size);
+    if (items == NULL) {
+        Py_DECREF(obj);
+        return NULL;
+    }
+
+    int res = PyList_SetSlice(obj, PY_SSIZE_T_MAX, PY_SSIZE_T_MAX, items);
+    Py_DECREF(items);
 
-   if (res == -1) {
-       Py_DECREF(obj);
-       return NULL;
-   }
+    if (res == -1) {
+        Py_DECREF(obj);
+        return NULL;
+    }
 
     return obj;
 }

{hiredis-3.4.0.dev0 → hiredis-3.4.2}/tests/test_reader.py

@@ -1,3 +1,6 @@
+import gc
+import platform
+
 import hiredis
 import pytest
 
@@ -191,6 +194,33 @@ def test_vector(reader):
   assert isinstance(result, hiredis.PushNotification)
   assert [b"pubsub", b"message", b"channel", b"message"] == result
 
+@pytest.mark.skipif(platform.python_implementation() != "CPython",
+                    reason="requires CPython reference counting")
+def test_push_notification_releases_backing_list(reader):
+  # The list a notification is sized from is only borrowed by PyList_SetSlice,
+  # so not releasing it strands one list per notification received.
+  payload = b">4\r\n+pubsub\r\n+message\r\n+channel\r\n+message\r\n"
+  iterations = 512
+
+  def live_lists():
+    return sum(1 for obj in gc.get_objects() if type(obj) is list)
+
+  for _ in range(8):
+    reader.feed(payload)
+    reader.gets()
+  gc.collect()
+  before = live_lists()
+
+  for _ in range(iterations):
+    reader.feed(payload)
+    reader.gets()
+  gc.collect()
+
+  # Leaking strands exactly one list per iteration, so the bug reads as a delta
+  # of 512 where a fixed build measures 0. The bound is left far above 0 only so
+  # that allocations elsewhere in the run cannot make this flaky.
+  assert live_lists() - before < iterations // 8
+
 def test_verbatim_string(reader):
   value = b"text"
   reader.feed(b"=8\r\ntxt:%s\r\n" % value)