Address review

Author: sergey-miryanov

Modules/cjkcodecs/multibytecodec.c

@@ -107,13 +107,13 @@ make_tuple(PyObject *object, Py_ssize_t len)
         return NULL;
     }
 
-    PyObject* w = PyLong_FromSsize_t(len);
-    if (w == NULL) {
+    PyObject* len_obj = PyLong_FromSsize_t(len);
+    if (len_obj == NULL) {
         Py_DECREF(object);
         return NULL;
     }
 
-    return _PyTuple_FromPairSteal(object, w);
+    return _PyTuple_FromPairSteal(object, len_obj);
 }
 
 static PyObject *

Modules/overlapped.c

@@ -897,6 +897,7 @@ _overlapped_Overlapped_getresult_impl(OverlappedObject *self, BOOL wait)
     BOOL ret;
     DWORD err;
     PyObject *addr;
+    PyObject *transferred_obj;
 
     if (self->type == TYPE_NONE) {
         PyErr_SetString(PyExc_ValueError, "operation not yet attempted");
@@ -965,8 +966,6 @@ _overlapped_Overlapped_getresult_impl(OverlappedObject *self, BOOL wait)
             }
 
             // The result is a two item tuple: (message, address)
-            // first item: message
-            // second item: address
             self->read_from.result = _PyTuple_FromPairSteal(
                 Py_NewRef(self->read_from.allocated_buffer), addr);
             if (self->read_from.result == NULL) {
@@ -983,11 +982,15 @@ _overlapped_Overlapped_getresult_impl(OverlappedObject *self, BOOL wait)
                 return NULL;
             }
 
+            transferred_obj = PyLong_FromUnsignedLong((unsigned long)transferred);
+            if (transferred_obj == NULL) {
+                Py_DECREF(addr);
+                return NULL;
+            }
+
             // The result is a two item tuple: (number of bytes read, address)
-            // first item: number of bytes read
-            // second item: address
             self->read_from_into.result = _PyTuple_FromPairSteal(
-                PyLong_FromUnsignedLong((unsigned long)transferred), addr);
+                transferred_obj, addr);
             if (self->read_from_into.result == NULL) {
                 return NULL;
             }