commit 8c6849bfe6ccc0e508e23df385b4ca61c7e00236
author Martin Panter <vadmium+py@gmail.com> Mon Jul 11 00:17:13 2016 +0000
committer Martin Panter <vadmium+py@gmail.com> Mon Jul 11 00:17:13 2016 +0000
tree 13ac8e3b8566bdb9dfaaae5e365146f4984db8dd
parent 2d2e6be39a06a96e877b13f00acb85b01eb93bca

Issue #23804: Fix SSL zero-length recv() calls to not block and raise EOF

Modules/_ssl.c

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index def24c2..4572751 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -1702,6 +1702,10 @@
         dest = PyBytes_FromStringAndSize(NULL, len);
         if (dest == NULL)
             goto error;
+        if (len == 0) {
+            Py_XDECREF(sock);
+            return dest;
+        }
         mem = PyBytes_AS_STRING(dest);
     }
     else {
@@ -1714,6 +1718,10 @@
                                 "maximum length can't fit in a C 'int'");
                 goto error;
             }
+            if (len == 0) {
+                count = 0;
+                goto done;
+            }
         }
     }