]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.11] gh-105375: Improve _decimal error handling (GH-105605) (#105648)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Sun, 11 Jun 2023 10:58:56 +0000 (03:58 -0700)
committerGitHub <noreply@github.com>
Sun, 11 Jun 2023 10:58:56 +0000 (10:58 +0000)
Fix a bug where an exception could end up being overwritten.
(cherry picked from commit c932f7284977ebf813313157c52d716ba225a7ac)

Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
Misc/NEWS.d/next/Library/2023-06-09-22-52-45.gh-issue-105375.6igkhn.rst [new file with mode: 0644]
Modules/_decimal/_decimal.c

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
new file mode 100644 (file)
index 0000000..05e78fd
--- /dev/null
@@ -0,0 +1 @@
+Fix bug in :mod:`decimal` where an exception could end up being overwritten.
index 65885965ff046ded7414a32aa4962d9484c3c5bd..0e7d379e006cb1ca95ad9f34b795061316bc9545 100644 (file)
@@ -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;
         }
     }