bpo-30555: Also consider NULL as a possible error in HANDLE_return_converter

Author: segevfiner

PC/clinic/msvcrtmodule.c.h

@@ -174,7 +174,7 @@ msvcrt_get_osfhandle(PyObject *module, PyObject *arg)
         goto exit;
     }
     _return_value = msvcrt_get_osfhandle_impl(module, fd);
-    if ((_return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) {
+    if ((_return_value == NULL || _return_value == INVALID_HANDLE_VALUE) && PyErr_Occurred()) {
         goto exit;
     }
     return_value = PyLong_FromVoidPtr(_return_value);
@@ -589,4 +589,4 @@ msvcrt_SetErrorMode(PyObject *module, PyObject *arg)
 #ifndef MSVCRT_SET_ERROR_MODE_METHODDEF
     #define MSVCRT_SET_ERROR_MODE_METHODDEF
 #endif /* !defined(MSVCRT_SET_ERROR_MODE_METHODDEF) */
-/*[clinic end generated code: output=14ab3d3d39ce9deb input=a9049054013a1b77]*/
+/*[clinic end generated code: output=b7829f02d3bc2a9f input=a9049054013a1b77]*/

PC/msvcrtmodule.c

@@ -42,7 +42,9 @@ class HANDLE_return_converter(CReturnConverter):
 
     def render(self, function, data):
         self.declare(data)
-        self.err_occurred_if("_return_value == INVALID_HANDLE_VALUE", data)
+        self.err_occurred_if(
+            "_return_value == NULL || _return_value == INVALID_HANDLE_VALUE",
+            data)
         data.return_conversion.append(
             'return_value = PyLong_FromVoidPtr(_return_value);\n')
 
@@ -63,7 +65,7 @@ class wchar_t_return_converter(CReturnConverter):
         data.return_conversion.append(
             'return_value = PyUnicode_FromOrdinal(_return_value);\n')
 [python start generated code]*/
-/*[python end generated code: output=da39a3ee5e6b4b0d input=dab543102cf6345d]*/
+/*[python end generated code: output=da39a3ee5e6b4b0d input=2b25dc89e9e59534]*/
 
 /*[clinic input]
 module msvcrt