summaryrefslogtreecommitdiff
path: root/Modules/faulthandler.c
diff options
context:
space:
mode:
authorCharles-François Natali <cf.natali@gmail.com>2013-09-08 12:35:53 +0200
committerCharles-François Natali <cf.natali@gmail.com>2013-09-08 12:35:53 +0200
commit6f6f4865d138f2348889ccc08aa8b18ca0263e48 (patch)
tree2ee676e57d6705a6d1542ce29e6427da204badb8 /Modules/faulthandler.c
parent807ba8552a5e6dffa4d15f8f9a1e2679507efcfb (diff)
parenta3c18d0f1423b192f82bd785cea09346942cf18e (diff)
downloadcpython-git-6f6f4865d138f2348889ccc08aa8b18ca0263e48.tar.gz
Merge.
Diffstat (limited to 'Modules/faulthandler.c')
-rw-r--r--Modules/faulthandler.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
index 172945d1a4..47bc9e8d3b 100644
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -1048,8 +1048,11 @@ faulthandler_env_options(void)
{
PyObject *xoptions, *key, *module, *res;
_Py_IDENTIFIER(enable);
+ char *p;
- if (!Py_GETENV("PYTHONFAULTHANDLER")) {
+ if (!((p = Py_GETENV("PYTHONFAULTHANDLER")) && *p != '\0')) {
+ /* PYTHONFAULTHANDLER environment variable is missing
+ or an empty string */
int has_key;
xoptions = PySys_GetXOptions();