[Python-checkins] closes bpo-39262: Use specific out-of-memory message in _sharedexception_bind. (GH-17908)

[Benjamin Peterson]

https://github.com/python/cpython/commit/5cae042f686cc174e00093944dc118914c874b7c
commit: 5cae042f686cc174e00093944dc118914c874b7c
branch: master
author: Alex Henrie <alexhenrie24 at gmail.com>
committer: Benjamin Peterson <benjamin at python.org>
date: 2020-01-08T18:48:52-08:00
summary:

closes bpo-39262: Use specific out-of-memory message in _sharedexception_bind. (GH-17908)

files:
M Modules/_xxsubinterpretersmodule.c

diff --git a/Modules/_xxsubinterpretersmodule.c b/Modules/_xxsubinterpretersmodule.c
index 4a6ffdd326678..fa20bc5dcec57 100644
--- a/Modules/_xxsubinterpretersmodule.c
+++ b/Modules/_xxsubinterpretersmodule.c
@@ -221,8 +221,9 @@ _sharedexception_bind(PyObject *exctype, PyObject *exc, PyObject *tb)
     if (err->name == NULL) {
         if (PyErr_ExceptionMatches(PyExc_MemoryError)) {
             failure = "out of memory copying exception type name";
+        } else {
+            failure = "unable to encode and copy exception type name";
         }
-        failure = "unable to encode and copy exception type name";
         goto finally;
     }
 
@@ -237,8 +238,9 @@ _sharedexception_bind(PyObject *exctype, PyObject *exc, PyObject *tb)
         if (err->msg == NULL) {
             if (PyErr_ExceptionMatches(PyExc_MemoryError)) {
                 failure = "out of memory copying exception message";
+            } else {
+                failure = "unable to encode and copy exception message";
             }
-            failure = "unable to encode and copy exception message";
             goto finally;
         }
     }