Modules/socketmodule.c: error handling scheme (no raise)

korli · encukou · web-flow · commit 1af62dbe2fb3 · 2024-09-06T12:01:38.000+02:00
Co-authored-by: Petr Viktorin &lt;encukou@gmail.com&gt;
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -3490,8 +3490,10 @@ sock_connect(PySocketSockObject *s, PyObject *addro)
     }
 
     res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 1);
-    if (res == -1 && PyErr_Occurred())
+    if (res < 0) {
+        assert(PyErr_Occurred());
         return NULL;
+    }
 
     Py_RETURN_NONE;
 }

Original file line number	Diff line number	Diff line change
`@@ -3490,8 +3490,10 @@ sock_connect(PySocketSockObject s, PyObject addro)`
`3490`	`3490`	`}`
`3491`	`3491`
`3492`	`3492`	`res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 1);`
`3493`		`- if (res == -1 && PyErr_Occurred())`
	`3493`	`+ if (res < 0) {`
	`3494`	`+ assert(PyErr_Occurred());`
`3494`	`3495`	`return NULL;`
	`3496`	`+ }`
`3495`	`3497`
`3496`	`3498`	`Py_RETURN_NONE;`
`3497`	`3499`	`}`