[asterisk-commits] mnicholson: trunk r319143 - in /trunk: ./ channels/chan_sip.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon May 16 10:54:59 CDT 2011
Author: mnicholson
Date: Mon May 16 10:54:52 2011
New Revision: 319143
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=319143
Log:
Merged revisions 319142 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r319142 | mnicholson | 2011-05-16 10:53:26 -0500 (Mon, 16 May 2011) | 8 lines
Make sure tcptls_session exists before dereferencing it.
(closes issue #19192)
Reported by: stknob
Patches:
10-tcptls-unreachable-peer-segfault.patch uploaded by Chainsaw (license 723)
Tested by: vois, Chainsaw
........
Modified:
trunk/ (props changed)
trunk/channels/chan_sip.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=319143&r1=319142&r2=319143
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon May 16 10:54:52 2011
@@ -2758,7 +2758,7 @@
ast_debug(2, "Shutting down thread for %s server\n", tcptls_session->ssl ? "SSL" : "TCP");
cleanup:
- if (!tcptls_session->client && !authenticated) {
+ if (tcptls_session && !tcptls_session->client && !authenticated) {
ast_atomic_fetchadd_int(&unauth_sessions, -1);
}
More information about the asterisk-commits
mailing list