summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Schemenauer <nascheme@enme.ucalgary.ca>2000-10-04 16:25:07 (GMT)
committerNeil Schemenauer <nascheme@enme.ucalgary.ca>2000-10-04 16:25:07 (GMT)
commit97d723bd6219f2d460a68137e5e23533888164c2 (patch)
treeddefd9616b61f22be76f1f4a26caad9e3f3c7b72
parent5196c586bbcde40538868f8aa3a1f54af1027e33 (diff)
downloadcpython-97d723bd6219f2d460a68137e5e23533888164c2.zip
cpython-97d723bd6219f2d460a68137e5e23533888164c2.tar.gz
cpython-97d723bd6219f2d460a68137e5e23533888164c2.tar.bz2
- do not start collection during processing of an exception
-rw-r--r--Modules/gcmodule.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index cf88481..ba95032 100644
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -502,7 +502,11 @@ _PyGC_Insert(PyObject *op)
abort();
}
#endif
- if (allocated > threshold0 && enabled && threshold0 && !collecting) {
+ if (allocated > threshold0 &&
+ enabled &&
+ threshold0 &&
+ !collecting &&
+ !PyErr_Occurred()) {
collecting++;
collect_generations();
collecting--;