respond to review

koubaa · koubaa · commit 0be5d6ca64ba · 2020-08-21T18:46:52.000-05:00
diff --git a/Modules/_blake2/blake2b_impl.c b/Modules/_blake2/blake2b_impl.c
@@ -391,10 +391,11 @@ py_blake2b_dealloc(PyObject *self)
         PyThread_free_lock(obj->lock);
         obj->lock = NULL;
     }
-    PyTypeObject *tp = Py_TYPE(self);
-    Py_DECREF(tp);
 
     PyObject_Del(self);
+
+    PyTypeObject *tp = Py_TYPE(self);
+    Py_DECREF(tp);
 }
 
 static PyType_Slot blake2b_type_slots[] = {
diff --git a/Modules/_blake2/blake2module.c b/Modules/_blake2/blake2module.c
@@ -37,9 +37,11 @@ static struct PyMethodDef blake2mod_functions[] = {
 #define ADD_INT(d, name, value) do { \
     PyObject *x = PyLong_FromLong(value); \
     if (!x) { \
+        Py_DECREF(x); \
         return -1; \
     } \
     if (PyDict_SetItemString(d, name, x) < 0) { \
+        Py_DECREF(x); \
         return -1; \
     } \
     Py_DECREF(x); \
@@ -53,6 +55,8 @@ static int blake2_exec(PyObject *m)
     st->blake2b_type = (PyTypeObject *)PyType_FromModuleAndSpec(
         m, &blake2b_type_spec, NULL);
 
+    if (NULL == st->blake2b_type)
+        return -1;
     /* BLAKE2b */
     if (PyModule_AddType(m, st->blake2b_type) < 0) {
         return -1;
@@ -73,6 +77,9 @@ static int blake2_exec(PyObject *m)
     st->blake2s_type = (PyTypeObject *)PyType_FromModuleAndSpec(
         m, &blake2s_type_spec, NULL);
 
+    if (NULL == st->blake2s_type)
+        return -1;
+
     if (PyModule_AddType(m, st->blake2s_type) < 0) {
         return -1;
     }
diff --git a/Modules/_blake2/blake2s_impl.c b/Modules/_blake2/blake2s_impl.c
@@ -391,10 +391,10 @@ py_blake2s_dealloc(PyObject *self)
         obj->lock = NULL;
     }
 
+    PyObject_Del(self);
+
     PyTypeObject *tp = Py_TYPE(self);
     Py_DECREF(tp);
-
-    PyObject_Del(self);
 }
 
 static PyType_Slot blake2s_type_slots[] = {

Original file line number	Diff line number	Diff line change
`@@ -391,10 +391,11 @@ py_blake2b_dealloc(PyObject *self)`
`391`	`391`	`PyThread_free_lock(obj->lock);`
`392`	`392`	`obj->lock = NULL;`
`393`	`393`	`}`
`394`		`- PyTypeObject *tp = Py_TYPE(self);`
`395`		`- Py_DECREF(tp);`
`396`	`394`
`397`	`395`	`PyObject_Del(self);`
	`396`	`+`
	`397`	`+ PyTypeObject *tp = Py_TYPE(self);`
	`398`	`+ Py_DECREF(tp);`
`398`	`399`	`}`
`399`	`400`
`400`	`401`	`static PyType_Slot blake2b_type_slots[] = {`
Original file line number	Diff line number	Diff line change
`@@ -391,10 +391,10 @@ py_blake2s_dealloc(PyObject *self)`
`391`	`391`	`obj->lock = NULL;`
`392`	`392`	`}`
`393`	`393`
	`394`	`+ PyObject_Del(self);`
	`395`	`+`
`394`	`396`	`PyTypeObject *tp = Py_TYPE(self);`
`395`	`397`	`Py_DECREF(tp);`
`396`		`-`
`397`		`- PyObject_Del(self);`
`398`	`398`	`}`
`399`	`399`
`400`	`400`	`static PyType_Slot blake2s_type_slots[] = {`