gh-84808: Handle errors returned by internal_connect()

korli · korli · commit 2ca0c6c16ce2 · 2024-07-27T17:08:05.000+02:00
Python shouldn't assume that errno codes are positive.

reported and proposed by Ryan C. Gordon
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -3489,7 +3489,7 @@ sock_connect(PySocketSockObject *s, PyObject *addro)
     }
 
     res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 1);
-    if (res < 0)
+    if (res == -1)
         return NULL;
 
     Py_RETURN_NONE;
@@ -3520,7 +3520,7 @@ sock_connect_ex(PySocketSockObject *s, PyObject *addro)
     }
 
     res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 0);
-    if (res < 0)
+    if (res == -1)
         return NULL;
 
     return PyLong_FromLong((long) res);

Original file line number	Diff line number	Diff line change
`@@ -3489,7 +3489,7 @@ sock_connect(PySocketSockObject s, PyObject addro)`
`3489`	`3489`	`}`
`3490`	`3490`
`3491`	`3491`	`res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 1);`
`3492`		`- if (res < 0)`
	`3492`	`+ if (res == -1)`
`3493`	`3493`	`return NULL;`
`3494`	`3494`
`3495`	`3495`	`Py_RETURN_NONE;`
`@@ -3520,7 +3520,7 @@ sock_connect_ex(PySocketSockObject s, PyObject addro)`
`3520`	`3520`	`}`
`3521`	`3521`
`3522`	`3522`	`res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 0);`
`3523`		`- if (res < 0)`
	`3523`	`+ if (res == -1)`
`3524`	`3524`	`return NULL;`
`3525`	`3525`
`3526`	`3526`	`return PyLong_FromLong((long) res);`