Issue #18343: faulthandler.register() now keeps the previous signal handler

vstinner · vstinner · commit 8d3795474eb7 · 2013-07-02T00:14:56.000+02:00
when the function is called twice, so faulthandler.unregister() restores
correctly the original signal handler.
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -41,6 +41,10 @@ Core and Builtins
 Library
 -------
 
+- Issue #18343: faulthandler.register() now keeps the previous signal handler
+  when the function is called twice, so faulthandler.unregister() restores
+  correctly the original signal handler.
+
 - Issue #17097: Make multiprocessing ignore EINTR.
 
 - Issue #18339: Negative ints keys in unpickler.memo dict no longer cause a
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
@@ -742,6 +742,8 @@ faulthandler_register_py(PyObject *self,
             PyErr_SetFromErrno(PyExc_OSError);
             return NULL;
         }
+
+        user->previous = previous;
     }
 
     Py_XDECREF(user->file);
@@ -750,7 +752,6 @@ faulthandler_register_py(PyObject *self,
     user->fd = fd;
     user->all_threads = all_threads;
     user->chain = chain;
-    user->previous = previous;
     user->interp = tstate->interp;
     user->enabled = 1;
 

Original file line number	Diff line number	Diff line change
`@@ -742,6 +742,8 @@ faulthandler_register_py(PyObject *self,`
`742`	`742`	`PyErr_SetFromErrno(PyExc_OSError);`
`743`	`743`	`return NULL;`
`744`	`744`	`}`
	`745`	`+`
	`746`	`+ user->previous = previous;`
`745`	`747`	`}`
`746`	`748`
`747`	`749`	`Py_XDECREF(user->file);`
`@@ -750,7 +752,6 @@ faulthandler_register_py(PyObject *self,`
`750`	`752`	`user->fd = fd;`
`751`	`753`	`user->all_threads = all_threads;`
`752`	`754`	`user->chain = chain;`
`753`		`- user->previous = previous;`
`754`	`755`	`user->interp = tstate->interp;`
`755`	`756`	`user->enabled = 1;`
`756`	`757`