]> granicus.if.org Git - python/commitdiff
overlapped.c: Fix usage of the union
authorVictor Stinner <victor.stinner@gmail.com>
Thu, 30 Jan 2014 18:06:44 +0000 (19:06 +0100)
committerVictor Stinner <victor.stinner@gmail.com>
Thu, 30 Jan 2014 18:06:44 +0000 (19:06 +0100)
* read_buffer can only be used for TYPE_READ and TYPE_ACCEPT types
* write_buffer can only be used for TYPE_WRITE type

Modules/overlapped.c

index 625c76eff4e6d444ff15db93f59edde1abbd42ea..6842efbb30b13b80538284e81c9e0c4bee6f097e 100644 (file)
@@ -45,9 +45,9 @@ typedef struct {
     /* Type of operation */
     DWORD type;
     union {
-        /* Buffer used for reading (optional) */
+        /* Buffer used for reading: TYPE_READ and TYPE_ACCEPT */
         PyObject *read_buffer;
-        /* Buffer used for writing (optional) */
+        /* Buffer used for writing: TYPE_WRITE */
         Py_buffer write_buffer;
     };
 } OverlappedObject;
@@ -568,13 +568,15 @@ Overlapped_dealloc(OverlappedObject *self)
     if (self->overlapped.hEvent != NULL)
         CloseHandle(self->overlapped.hEvent);
 
-    if (self->write_buffer.obj)
-        PyBuffer_Release(&self->write_buffer);
-
     switch (self->type) {
-        case TYPE_READ:
-        case TYPE_ACCEPT:
-            Py_CLEAR(self->read_buffer);
+    case TYPE_READ:
+    case TYPE_ACCEPT:
+        Py_CLEAR(self->read_buffer);
+        break;
+    case TYPE_WRITE:
+        if (self->write_buffer.obj)
+            PyBuffer_Release(&self->write_buffer);
+        break;
     }
     PyObject_Del(self);
     SetLastError(olderr);
@@ -648,7 +650,7 @@ Overlapped_getresult(OverlappedObject *self, PyObject *args)
         case ERROR_MORE_DATA:
             break;
         case ERROR_BROKEN_PIPE:
-            if (self->read_buffer != NULL)
+            if ((self->type == TYPE_READ || self->type == TYPE_ACCEPT) && self->read_buffer != NULL)
                 break;
             /* fall through */
         default: