Fix refleaks on module and in ZstdDict

emmatyping · emmatyping · commit 63288607c96e · 2025-05-02T10:47:06.000-07:00
diff --git a/Modules/_zstd/_zstdmodule.c b/Modules/_zstd/_zstdmodule.c
@@ -642,6 +642,7 @@ add_vars_to_module(PyObject *module)
         Py_XDECREF(obj);
         return -1;
     }
+    Py_DECREF(obj);
 
     /* Add zstd parameters */
     if (add_parameters(module) < 0) {
@@ -664,6 +665,7 @@ add_vars_to_module(PyObject *module)
         Py_XDECREF(obj);
         return -1;
     }
+    Py_DECREF(obj);
 
     /* _ZSTD_CStreamSizes */
     obj = Py_BuildValue("II",
@@ -673,6 +675,7 @@ add_vars_to_module(PyObject *module)
         Py_XDECREF(obj);
         return -1;
     }
+    Py_DECREF(obj);
 
     /* _ZSTD_DStreamSizes */
     obj = Py_BuildValue("II",
@@ -682,6 +685,7 @@ add_vars_to_module(PyObject *module)
         Py_XDECREF(obj);
         return -1;
     }
+    Py_DECREF(obj);
 
     /* _ZSTD_CONFIG */
     obj = Py_BuildValue("isOOO", 8*(int)sizeof(Py_ssize_t), "c",
@@ -698,6 +702,7 @@ add_vars_to_module(PyObject *module)
         Py_XDECREF(obj);
         return -1;
     }
+    Py_DECREF(obj);
 
     return 0;
 }
@@ -721,7 +726,6 @@ add_type_to_module(PyObject *module, const char *name,
         return -1;
     }
 
-    Py_INCREF(temp);
     *dest = (PyTypeObject*) temp;
 
     return 0;
@@ -780,7 +784,6 @@ static int _zstd_exec(PyObject *module) {
         return -1;
     }
 
-    Py_INCREF(mod_state->ZstdError);
     if (PyModule_AddObjectRef(module, "ZstdError", mod_state->ZstdError) < 0) {
         Py_DECREF(mod_state->ZstdError);
         return -1;
diff --git a/Modules/_zstd/zdict.c b/Modules/_zstd/zdict.c
@@ -61,6 +61,7 @@ ZstdDict_dealloc(PyObject *ob)
 
     /* Release dict_content after Free ZSTD_CDict/ZSTD_DDict instances */
     Py_CLEAR(self->dict_content);
+    Py_CLEAR(self->c_dicts);
 
     PyTypeObject *tp = Py_TYPE(self);
     PyObject_GC_Del(ob);

Original file line number	Diff line number	Diff line change
`@@ -642,6 +642,7 @@ add_vars_to_module(PyObject *module)`
`642`	`642`	`Py_XDECREF(obj);`
`643`	`643`	`return -1;`
`644`	`644`	`}`
	`645`	`+ Py_DECREF(obj);`
`645`	`646`
`646`	`647`	`/* Add zstd parameters */`
`647`	`648`	`if (add_parameters(module) < 0) {`
`@@ -664,6 +665,7 @@ add_vars_to_module(PyObject *module)`
`664`	`665`	`Py_XDECREF(obj);`
`665`	`666`	`return -1;`
`666`	`667`	`}`
	`668`	`+ Py_DECREF(obj);`
`667`	`669`
`668`	`670`	`/* _ZSTD_CStreamSizes */`
`669`	`671`	`obj = Py_BuildValue("II",`
`@@ -673,6 +675,7 @@ add_vars_to_module(PyObject *module)`
`673`	`675`	`Py_XDECREF(obj);`
`674`	`676`	`return -1;`
`675`	`677`	`}`
	`678`	`+ Py_DECREF(obj);`
`676`	`679`
`677`	`680`	`/* _ZSTD_DStreamSizes */`
`678`	`681`	`obj = Py_BuildValue("II",`
`@@ -682,6 +685,7 @@ add_vars_to_module(PyObject *module)`
`682`	`685`	`Py_XDECREF(obj);`
`683`	`686`	`return -1;`
`684`	`687`	`}`
	`688`	`+ Py_DECREF(obj);`
`685`	`689`
`686`	`690`	`/* _ZSTD_CONFIG */`
`687`	`691`	`obj = Py_BuildValue("isOOO", 8*(int)sizeof(Py_ssize_t), "c",`
`@@ -698,6 +702,7 @@ add_vars_to_module(PyObject *module)`
`698`	`702`	`Py_XDECREF(obj);`
`699`	`703`	`return -1;`
`700`	`704`	`}`
	`705`	`+ Py_DECREF(obj);`
`701`	`706`
`702`	`707`	`return 0;`
`703`	`708`	`}`
`@@ -721,7 +726,6 @@ add_type_to_module(PyObject module, const char name,`
`721`	`726`	`return -1;`
`722`	`727`	`}`
`723`	`728`
`724`		`- Py_INCREF(temp);`
`725`	`729`	`dest = (PyTypeObject) temp;`
`726`	`730`
`727`	`731`	`return 0;`
`@@ -780,7 +784,6 @@ static int _zstd_exec(PyObject *module) {`
`780`	`784`	`return -1;`
`781`	`785`	`}`
`782`	`786`
`783`		`- Py_INCREF(mod_state->ZstdError);`
`784`	`787`	`if (PyModule_AddObjectRef(module, "ZstdError", mod_state->ZstdError) < 0) {`
`785`	`788`	`Py_DECREF(mod_state->ZstdError);`
`786`	`789`	`return -1;`