diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-17 19:37:51 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-17 19:37:51 +0000 |
| commit | d5def0fbe53415de4f4075740d5f60885f7ecf70 (patch) | |
| tree | 9316517f166cc00ab9e6eac6cc9bd715637b50ae | |
| parent | b96a728f71e279c8e1a235c9f453f7cdc394e71b (diff) | |
Issue #7176 - Crash in expire_register (imported from 1.2)
This is a bad fix, since peer should never be 0. Why is it zero
on Royk's system?
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@27928 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index c776517b5..ac1fd58d0 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -6070,19 +6070,26 @@ static void destroy_association(struct sip_peer *peer) static int expire_register(void *data) { struct sip_peer *peer = data; + + if (!peer) /* Hmmm. We have no peer. Weird. */ + return 0; memset(&peer->addr, 0, sizeof(peer->addr)); - destroy_association(peer); + destroy_association(peer); /* remove registration data from storage */ manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "Peer: SIP/%s\r\nPeerStatus: Unregistered\r\nCause: Expired\r\n", peer->name); - register_peer_exten(peer, FALSE); + register_peer_exten(peer, FALSE); /* Remove regexten */ peer->expire = -1; ast_device_state_changed("SIP/%s", peer->name); + + /* Do we need to release this peer from memory? + Only for realtime peers and autocreated peers + */ if (ast_test_flag(&peer->flags[1], SIP_PAGE2_SELFDESTRUCT) || ast_test_flag(&peer->flags[1], SIP_PAGE2_RTAUTOCLEAR)) { - peer = ASTOBJ_CONTAINER_UNLINK(&peerl, peer); - ASTOBJ_UNREF(peer, sip_destroy_peer); + peer = ASTOBJ_CONTAINER_UNLINK(&peerl, peer); /* Remove from peer list */ + ASTOBJ_UNREF(peer, sip_destroy_peer); /* Remove from memory */ } return 0; |