mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#3114 fix a bus error when deallocated exceptions were used

Browse source
This commit is contained in:
Benjamin Peterson 2008-06-15 00:05:44 +00:00
parent c5e94641bf
commit 979f311728
2 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Lib/test/test_exceptions.py
View file

@ -5,6 +5,8 @@ import sys
import unittest import unittest
import pickle import pickle
import weakref import weakref
import gc
import traceback
from test.support import TESTFN, unlink, run_unittest from test.support import TESTFN, unlink, run_unittest
@ -551,6 +553,23 @@ class ExceptionTests(unittest.TestCase):
del g del g
self.assertEquals(sys.exc_info()[0], TypeError) self.assertEquals(sys.exc_info()[0], TypeError)
def test_crash_3114(self):
# Bug #3114: in its destructor, MyObject retrieves a pointer to a
# deallocated exception instance or traceback.
class MyObject:
def __del__(self):
nonlocal e
e = sys.exc_info()
e = ()
try:
raise Exception(MyObject())
except:
pass
gc.collect()
[0]*10000
# Do something with the exception and its traceback
traceback.format_exception(*e)
def test_main(): def test_main():
run_unittest(ExceptionTests) run_unittest(ExceptionTests)

12
Python/ceval.c
View file

@ -704,11 +704,11 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
PyObject *v = POP(); \ PyObject *v = POP(); \
Py_XDECREF(v); \ Py_XDECREF(v); \
} \ } \
Py_XDECREF(tstate->exc_type); \ Py_CLEAR(tstate->exc_type); \
Py_CLEAR(tstate->exc_value); \
Py_CLEAR(tstate->exc_traceback); \
tstate->exc_type = POP(); \ tstate->exc_type = POP(); \
Py_XDECREF(tstate->exc_value); \
tstate->exc_value = POP(); \ tstate->exc_value = POP(); \
Py_XDECREF(tstate->exc_traceback); \
tstate->exc_traceback = POP(); tstate->exc_traceback = POP();
#define SAVE_EXC_STATE() \ #define SAVE_EXC_STATE() \
@ -716,9 +716,9 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
Py_XINCREF(tstate->exc_type); \ Py_XINCREF(tstate->exc_type); \
Py_XINCREF(tstate->exc_value); \ Py_XINCREF(tstate->exc_value); \
Py_XINCREF(tstate->exc_traceback); \ Py_XINCREF(tstate->exc_traceback); \
Py_XDECREF(f->f_exc_type); \ Py_CLEAR(f->f_exc_type); \
Py_XDECREF(f->f_exc_value); \ Py_CLEAR(f->f_exc_value); \
Py_XDECREF(f->f_exc_traceback); \ Py_CLEAR(f->f_exc_traceback); \
f->f_exc_type = tstate->exc_type; \ f->f_exc_type = tstate->exc_type; \
f->f_exc_value = tstate->exc_value; \ f->f_exc_value = tstate->exc_value; \
f->f_exc_traceback = tstate->exc_traceback; \ f->f_exc_traceback = tstate->exc_traceback; \