Merge remote-tracking branch 'upstream/main' into codecs-exc

python · iritkatriel · Mar 21, 2023 · Mar 3, 2023 · Mar 3, 2023 · Mar 3, 2023
commit af91411cac970a6f49a485156363b515029f4b73
diff --git a/Include/cpython/pyerrors.h b/Include/cpython/pyerrors.h
@@ -112,9 +112,9 @@ PyAPI_FUNC(PyObject *) _PyErr_FormatFromCause(
 
 /* In exceptions.c */
 
-PyAPI_FUNC(PyObject*) _PyException_AddNote(
-    PyObject *exc,
-    PyObject *note);
+PyAPI_FUNC(int) _PyException_AddNote(
+     PyObject *exc,
+     PyObject *note);
 
 /* In signalmodule.c */
 

@@ -3749,16 +3749,18 @@ _PyExc_Fini(PyInterpreterState *interp)
     _PyExc_FiniTypes(interp);
 }
 
-
-PyObject*
+int
 _PyException_AddNote(PyObject *exc, PyObject *note)
 {
     if (!PyExceptionInstance_Check(exc)) {
         PyErr_Format(PyExc_TypeError,
                      "exc must be an exception, not '%s'",
                      Py_TYPE(exc)->tp_name);
-        return NULL;
+        return -1;
     }
-    return BaseException_add_note(exc, note);
+    PyObject *r = BaseException_add_note(exc, note);
+    int res = r == NULL ? -1 : 0;
+    Py_XDECREF(r);
+    return res;
 }
 
diff --git a/Python/codecs.c b/Python/codecs.c
@@ -393,14 +393,12 @@ add_note_to_codec_error(const char *operation,
         _PyErr_ChainExceptions1(exc);
         return;
     }
-    PyObject *res = _PyException_AddNote(exc, note);
+    int res = _PyException_AddNote(exc, note);
     Py_DECREF(note);
-
-    if (res == NULL) {
+    if (res < 0) {
         _PyErr_ChainExceptions1(exc);
         return;
     }
-    Py_DECREF(res);
     PyErr_SetRaisedException(exc);
 }