diff options
| author | Steve Huston <shuston@riverace.com> | 2012-09-07 19:45:20 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2012-09-07 19:45:20 +0000 |
| commit | de4f47c01ff53c4074c979e80b60d3b3251a8fef (patch) | |
| tree | 50511f12e2f61b32ba022dcae0a80f69077e64e0 | |
| parent | 1d30d9c35d9fe443e5965e8bbbcbb6428baec3c4 (diff) | |
| download | ATCD-de4f47c01ff53c4074c979e80b60d3b3251a8fef.tar.gz | |
ChangeLogTag:Fri Sep 7 19:43:12 UTC 2012 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/Sig_Handler.cpp | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 9f10a5168c8..a68d5fc202c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Fri Sep 7 19:43:12 UTC 2012 Steve Huston <shuston@riverace.com> + + * ace/Sig_Handler.cpp (remove_handler_i): Check if the event handler + pointer is 0 before calling through it. Thanks to Adam Mitz + for catching this one. + Thu Sep 6 18:51:47 UTC 2012 Steve Huston <shuston@riverace.com> * ace/Sig_Handler.h: diff --git a/ACE/ace/Sig_Handler.cpp b/ACE/ace/Sig_Handler.cpp index fdc8531bbdd..7f9d35ce4c7 100644 --- a/ACE/ace/Sig_Handler.cpp +++ b/ACE/ace/Sig_Handler.cpp @@ -214,8 +214,9 @@ ACE_Sig_Handler::remove_handler_i (int signum, ACE_Sig_Handler::signal_handlers_[signum] = 0; // Allow the event handler to close down if necessary. - eh->handle_close (ACE_INVALID_HANDLE, - ACE_Event_Handler::SIGNAL_MASK); + if (eh) + eh->handle_close (ACE_INVALID_HANDLE, + ACE_Event_Handler::SIGNAL_MASK); // Register either the new disposition or restore the default. return new_disp->register_action (signum, old_disp); |