Correct one of the "MemoryError oddities":

the traceback would grow each time a MemoryError is raised.

1 files changed, 10 insertions, 0 deletions

diff --git a/Python/errors.c b/Python/errors.c
index a06ec02d9a..5ee6255a2a 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -321,7 +321,17 @@ PyErr_NoMemory(void)
 
 	/* raise the pre-allocated instance if it still exists */
 	if (PyExc_MemoryErrorInst)
+	{
+		/* Clear the previous traceback, otherwise it will be appended
+		 * to the current one.
+		 *
+		 * The following statement is not likely to raise any error;
+		 * if it does, we simply discard it.
+		 */
+		PyException_SetTraceback(PyExc_MemoryErrorInst, Py_None);
+
 		PyErr_SetObject(PyExc_MemoryError, PyExc_MemoryErrorInst);
+	}
 	else
 		/* this will probably fail since there's no memory and hee,
 		   hee, we have to instantiate this class