Properly flatten call to PyUnicode_AsWideChar

ZeroIntensity · ZeroIntensity · commit d720d9ab18dc · 2025-01-06T10:42:14.000-05:00
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
@@ -1552,12 +1552,9 @@ WCharArray_set_value(CDataObject *self, PyObject *value, void *Py_UNUSED(ignored
         return -1;
     }
     LOCK_PTR(self);
-    if (PyUnicode_AsWideChar(value, (wchar_t *)self->b_ptr, size) < 0) {
-        UNLOCK_PTR(self);
-        return -1;
-    }
+    int rc = PyUnicode_AsWideChar(value, (wchar_t *)self->b_ptr, size);
     UNLOCK_PTR(self);
-    return 0;
+    return rc < 0 ? -1 : 0;
 }
 
 static PyGetSetDef WCharArray_getsets[] = {

Original file line number	Diff line number	Diff line change
`@@ -1552,12 +1552,9 @@ WCharArray_set_value(CDataObject self, PyObject value, void *Py_UNUSED(ignored`
`1552`	`1552`	`return -1;`
`1553`	`1553`	`}`
`1554`	`1554`	`LOCK_PTR(self);`
`1555`		`- if (PyUnicode_AsWideChar(value, (wchar_t *)self->b_ptr, size) < 0) {`
`1556`		`- UNLOCK_PTR(self);`
`1557`		`- return -1;`
`1558`		`- }`
	`1555`	`+ int rc = PyUnicode_AsWideChar(value, (wchar_t *)self->b_ptr, size);`
`1559`	`1556`	`UNLOCK_PTR(self);`
`1560`		`- return 0;`
	`1557`	`+ return rc < 0 ? -1 : 0;`
`1561`	`1558`	`}`
`1562`	`1559`
`1563`	`1560`	`static PyGetSetDef WCharArray_getsets[] = {`