Unconditionally re-raise decoding errors

Author: picnixz

Include/internal/pycore_pyerrors.h

@@ -135,12 +135,12 @@ PyAPI_FUNC(void) _PyErr_SetString(
  * encoding (LC_CTYPE).
  *
  * Exceptions occurring in decoding take priority over the desired exception.
- * In those cases, this function returns -1. Otherwise this returns 0 if the
- * localized exception has been successfully set.
  *
  * Exported for '_ctypes' shared extensions.
  */
-PyAPI_FUNC(int) _PyErr_SetLocaleString(PyObject *exception, const char *string);
+PyAPI_FUNC(void) _PyErr_SetLocaleString(
+    PyObject *exception,
+    const char *string);
 
 PyAPI_FUNC(PyObject*) _PyErr_Format(
     PyThreadState *tstate,

Modules/_ctypes/_ctypes.c

@@ -984,11 +984,8 @@ CDataType_in_dll_impl(PyObject *type, PyTypeObject *cls, PyObject *dll,
     #ifdef USE_DLERROR
     const char *dlerr = dlerror();
     if (dlerr) {
-        if (_PyErr_SetLocaleString(PyExc_ValueError, dlerr) == 0) {
-            return NULL;
-        }
-        // Ignore decoding errors and fall back to the generic error.
-        PyErr_Clear();
+        _PyErr_SetLocaleString(PyExc_ValueError, dlerr);
+        return NULL;
     }
     #endif
 #undef USE_DLERROR
@@ -3801,17 +3798,14 @@ PyCFuncPtr_FromDll(PyTypeObject *type, PyObject *args, PyObject *kwds)
     address = (PPROC)dlsym(handle, name);
 
     if (!address) {
-	#ifdef USE_DLERROR
+    #ifdef USE_DLERROR
         const char *dlerr = dlerror();
         if (dlerr) {
-            if (_PyErr_SetLocaleString(PyExc_AttributeError, dlerr) == 0) {
-                Py_DECREF(ftuple);
-                return NULL;
-            }
-            // Ignore decoding errors and fall back to the generic error.
-            PyErr_Clear();
+            _PyErr_SetLocaleString(PyExc_AttributeError, dlerr);
+            Py_DECREF(ftuple);
+            return NULL;
         }
-	#endif
+    #endif
         PyErr_Format(PyExc_AttributeError, "function '%s' not found", name);
         Py_DECREF(ftuple);
         return NULL;

Modules/_ctypes/callproc.c

@@ -1589,11 +1589,8 @@ static PyObject *py_dl_open(PyObject *self, PyObject *args)
     if (!handle) {
         const char *errmsg = dlerror();
         if (errmsg) {
-            if (_PyErr_SetLocaleString(PyExc_OSError, errmsg) == 0) {
-                return NULL;
-            }
-            // Ignore decoding errors and fall back to the generic error.
-            PyErr_Clear();
+            _PyErr_SetLocaleString(PyExc_OSError, errmsg);
+            return NULL;
         }
         PyErr_SetString(PyExc_OSError, "dlopen() error");
         return NULL;
@@ -1610,11 +1607,8 @@ static PyObject *py_dl_close(PyObject *self, PyObject *args)
     if (dlclose(handle)) {
         const char *errmsg = dlerror();
         if (errmsg) {
-            if (_PyErr_SetLocaleString(PyExc_OSError, errmsg) == 0) {
-                return NULL;
-            }
-            // Ignore decoding errors and fall back to the generic error.
-            PyErr_Clear();
+            _PyErr_SetLocaleString(PyExc_OSError, errmsg);
+            return NULL;
         }
         PyErr_SetString(PyExc_OSError, "dlclose() error");
         return NULL;
@@ -1653,11 +1647,8 @@ static PyObject *py_dl_sym(PyObject *self, PyObject *args)
     #ifdef USE_DLERROR
     const char *errmsg = dlerror();
     if (errmsg) {
-        if (_PyErr_SetLocaleString(PyExc_OSError, errmsg) == 0) {
-            return NULL;
-        }
-        // Ignore decoding errors and fall back to the generic error below.
-        PyErr_Clear();
+        _PyErr_SetLocaleString(PyExc_OSError, errmsg);
+        return NULL;
     }
     #endif
     #undef USE_DLERROR

Modules/_gdbmmodule.c

@@ -37,22 +37,19 @@ get_gdbm_state(PyObject *module)
 /*
  * Set the gdbm error obtained by gdbm_strerror(gdbm_errno).
  *
- * If the error message cannot be decoded from the current locale
- * or if none exists, a generic (UTF-8) error message is used.
+ * If no error message exists, a generic (UTF-8) error message
+ * is used instead.
  */
 static void
 set_gdbm_error(_gdbm_state *state, const char *generic_error)
 {
     const char *gdbm_errmsg = gdbm_strerror(gdbm_errno);
     if (gdbm_errmsg) {
-        if (_PyErr_SetLocaleString(state->gdbm_error, gdbm_errmsg) == 0) {
-            return;
-        }
-        // Ignore decoding errors and fall back to the generic error.
-        PyErr_Clear();
+        _PyErr_SetLocaleString(state->gdbm_error, gdbm_errmsg);
+    }
+    else {
+        PyErr_SetString(state->gdbm_error, generic_error);
     }
-    assert(!PyErr_Occurred());
-    PyErr_SetString(state->gdbm_error, generic_error);
 }
 
 /*[clinic input]

Python/errors.c

@@ -301,16 +301,14 @@ PyErr_SetString(PyObject *exception, const char *string)
     _PyErr_SetString(tstate, exception, string);
 }
 
-int
+void
 _PyErr_SetLocaleString(PyObject *exception, const char *string)
 {
     PyObject *value = PyUnicode_DecodeLocale(string, "surrogateescape");
     if (value != NULL) {
         PyErr_SetObject(exception, value);
         Py_DECREF(value);
-        return 0;
     }
-    return -1;
 }
 
 PyObject* _Py_HOT_FUNCTION