Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
e905c844
Commit
e905c844
authored
Jun 01, 2018
by
pkerling
Committed by
Antoine Pitrou
Jun 01, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-30654: Do not reset SIGINT handler to SIG_DFL in finisignal (GH-7146)
parent
23cee80c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
12 deletions
+4
-12
Misc/NEWS.d/next/Core and Builtins/2018-05-28-12-28-53.bpo-30654.9fDJye.rst
...ore and Builtins/2018-05-28-12-28-53.bpo-30654.9fDJye.rst
+2
-0
Modules/signalmodule.c
Modules/signalmodule.c
+2
-12
No files found.
Misc/NEWS.d/next/Core and Builtins/2018-05-28-12-28-53.bpo-30654.9fDJye.rst
0 → 100644
View file @
e905c844
Fixed reset of the SIGINT handler to SIG_DFL on interpreter shutdown even
when there was a custom handler set previously. Patch by Philipp Kerling.
Modules/signalmodule.c
View file @
e905c844
...
...
@@ -126,13 +126,6 @@ static PyObject *DefaultHandler;
static
PyObject
*
IgnoreHandler
;
static
PyObject
*
IntHandler
;
/* On Solaris 8, gcc will produce a warning that the function
declaration is not a prototype. This is caused by the definition of
SIG_DFL as (void (*)())0; the correct declaration would have been
(void (*)(int))0. */
static
PyOS_sighandler_t
old_siginthandler
=
SIG_DFL
;
#ifdef MS_WINDOWS
static
HANDLE
sigint_event
=
NULL
;
#endif
...
...
@@ -1336,7 +1329,7 @@ PyInit__signal(void)
/* Install default int handler */
Py_INCREF
(
IntHandler
);
Py_SETREF
(
Handlers
[
SIGINT
].
func
,
IntHandler
);
old_siginthandler
=
PyOS_setsig
(
SIGINT
,
signal_handler
);
PyOS_setsig
(
SIGINT
,
signal_handler
);
}
#ifdef SIGHUP
...
...
@@ -1542,14 +1535,11 @@ finisignal(void)
int
i
;
PyObject
*
func
;
PyOS_setsig
(
SIGINT
,
old_siginthandler
);
old_siginthandler
=
SIG_DFL
;
for
(
i
=
1
;
i
<
NSIG
;
i
++
)
{
func
=
Handlers
[
i
].
func
;
_Py_atomic_store_relaxed
(
&
Handlers
[
i
].
tripped
,
0
);
Handlers
[
i
].
func
=
NULL
;
if
(
i
!=
SIGINT
&&
func
!=
NULL
&&
func
!=
Py_None
&&
if
(
func
!=
NULL
&&
func
!=
Py_None
&&
func
!=
DefaultHandler
&&
func
!=
IgnoreHandler
)
PyOS_setsig
(
i
,
SIG_DFL
);
Py_XDECREF
(
func
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment