[3.11] gh-105375: Improve _decimal error handling (GH-105605) (#105648)

miss-islington · erlend-aasland · web-flow · commit cb26fafdcc28 · 2023-06-11T10:58:56.000Z
Fix a bug where an exception could end up being overwritten. (cherry picked from commit c932f72) Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
diff --git a/Misc/NEWS.d/next/Library/2023-06-09-22-52-45.gh-issue-105375.6igkhn.rst b/Misc/NEWS.d/next/Library/2023-06-09-22-52-45.gh-issue-105375.6igkhn.rst
@@ -0,0 +1 @@
+Fix bug in :mod:`decimal` where an exception could end up being overwritten.
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
@@ -3658,9 +3658,13 @@ dec_as_integer_ratio(PyObject *self, PyObject *args UNUSED)
             goto error;
         }
         Py_SETREF(numerator, _py_long_floor_divide(numerator, tmp));
+        if (numerator == NULL) {
+            Py_DECREF(tmp);
+            goto error;
+        }
         Py_SETREF(denominator, _py_long_floor_divide(denominator, tmp));
         Py_DECREF(tmp);
-        if (numerator == NULL || denominator == NULL) {
+        if (denominator == NULL) {
             goto error;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix bug in :mod:`decimal` where an exception could end up being overwritten.
Original file line number	Diff line number	Diff line change
`@@ -3658,9 +3658,13 @@ dec_as_integer_ratio(PyObject self, PyObject args UNUSED)`
`3658`	`3658`	`goto error;`
`3659`	`3659`	`}`
`3660`	`3660`	`Py_SETREF(numerator, _py_long_floor_divide(numerator, tmp));`
	`3661`	`+ if (numerator == NULL) {`
	`3662`	`+ Py_DECREF(tmp);`
	`3663`	`+ goto error;`
	`3664`	`+ }`
`3661`	`3665`	`Py_SETREF(denominator, _py_long_floor_divide(denominator, tmp));`
`3662`	`3666`	`Py_DECREF(tmp);`
`3663`		`- if (numerator == NULL \|\| denominator == NULL) {`
	`3667`	`+ if (denominator == NULL) {`
`3664`	`3668`	`goto error;`
`3665`	`3669`	`}`
`3666`	`3670`	`}`