Fix the compiler warning a different way.

ericsnowcurrently · ericsnowcurrently · commit fc6920d7ee9b · 2025-04-25T17:18:29.000-06:00
diff --git a/Include/internal/pycore_moduleobject.h b/Include/internal/pycore_moduleobject.h
@@ -51,7 +51,7 @@ extern PyObject * _PyModule_GetFilenameObject(PyObject *);
 extern Py_ssize_t _PyModule_GetFilenameUTF8(
         PyObject *module,
         char *buffer,
-        size_t maxlen);
+        Py_ssize_t maxlen);
 
 PyObject* _Py_module_getattro_impl(PyModuleObject *m, PyObject *name, int suppress);
 PyObject* _Py_module_getattro(PyObject *m, PyObject *name);
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
@@ -668,10 +668,11 @@ PyModule_GetFilename(PyObject *m)
 }
 
 Py_ssize_t
-_PyModule_GetFilenameUTF8(PyObject *mod, char *buffer, size_t maxlen)
+_PyModule_GetFilenameUTF8(PyObject *mod, char *buffer, Py_ssize_t maxlen)
 {
     // We "return" an empty string for an invalid module
     // and for a missing, empty, or invalid filename.
+    assert(maxlen >= 0);
     Py_ssize_t size = -1;
     PyObject *filenameobj = _PyModule_GetFilenameObject(mod);
     if (filenameobj == NULL) {
@@ -684,7 +685,8 @@ _PyModule_GetFilenameUTF8(PyObject *mod, char *buffer, size_t maxlen)
     }
     else {
         const char *filename = PyUnicode_AsUTF8AndSize(filenameobj, &size);
-        if (size > PY_SIZE_MAX || (size_t)size > maxlen) {
+        assert(size >= 0);
+        if (size > maxlen) {
             size = -1;
             PyErr_SetString(PyExc_ValueError, "__file__ too long");
         }

Original file line number	Diff line number	Diff line change
`@@ -668,10 +668,11 @@ PyModule_GetFilename(PyObject *m)`
`668`	`668`	`}`
`669`	`669`
`670`	`670`	`Py_ssize_t`
`671`		`-_PyModule_GetFilenameUTF8(PyObject mod, char buffer, size_t maxlen)`
	`671`	`+_PyModule_GetFilenameUTF8(PyObject mod, char buffer, Py_ssize_t maxlen)`
`672`	`672`	`{`
`673`	`673`	`// We "return" an empty string for an invalid module`
`674`	`674`	`// and for a missing, empty, or invalid filename.`
	`675`	`+ assert(maxlen >= 0);`
`675`	`676`	`Py_ssize_t size = -1;`
`676`	`677`	`PyObject *filenameobj = _PyModule_GetFilenameObject(mod);`
`677`	`678`	`if (filenameobj == NULL) {`
`@@ -684,7 +685,8 @@ _PyModule_GetFilenameUTF8(PyObject mod, char buffer, size_t maxlen)`
`684`	`685`	`}`
`685`	`686`	`else {`
`686`	`687`	`const char *filename = PyUnicode_AsUTF8AndSize(filenameobj, &size);`
`687`		`- if (size > PY_SIZE_MAX \|\| (size_t)size > maxlen) {`
	`688`	`+ assert(size >= 0);`
	`689`	`+ if (size > maxlen) {`
`688`	`690`	`size = -1;`
`689`	`691`	`PyErr_SetString(PyExc_ValueError, "__file__ too long");`
`690`	`692`	`}`