Cleanup additions/fixes

agronholm · agronholm · commit 239559886be0 · 2022-02-28T01:01:36.000+02:00
diff --git a/Modules/overlapped.c b/Modules/overlapped.c
@@ -674,9 +674,9 @@ Overlapped_clear(OverlappedObject *self)
             break;
         }
         case TYPE_READ_FROM_INTO: {
-            if (self->read_from.result) {
+            if (self->read_from_into.result) {
                 // We've received a message, free the result tuple.
-                Py_CLEAR(self->read_from.result);
+                Py_CLEAR(self->read_from_into.result);
             }
             if (self->read_from_into.user_buffer.obj) {
                 PyBuffer_Release(&self->read_from_into.user_buffer);
@@ -887,6 +887,11 @@ _overlapped_Overlapped_getresult_impl(OverlappedObject *self, BOOL wait)
             {
                 break;
             }
+            else if (self->type == TYPE_READ_FROM_INTO &&
+                     self->read_from_into.result != NULL)
+            {
+                break;
+            }
             /* fall through */
         default:
             return SetFromWindowsErr(err);
@@ -1663,6 +1668,13 @@ Overlapped_traverse(OverlappedObject *self, visitproc visit, void *arg)
     case TYPE_READ_FROM:
         Py_VISIT(self->read_from.result);
         Py_VISIT(self->read_from.allocated_buffer);
+        break;
+    case TYPE_READ_FROM_INTO:
+        Py_VISIT(self->read_from_into.result);
+        if (self->read_from_into.user_buffer.obj) {
+            Py_VISIT(&self->read_from_into.user_buffer.obj);
+        }
+        break;
     }
     return 0;
 }
