[asterisk-commits] file: trunk r67305 - in /trunk: ./ channels/chan_iax2.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Tue Jun  5 10:24:01 2007
New Revision: 67305

URL: http://svn.digium.com/view/asterisk?view=rev&rev=67305
Log:
Merged revisions 67304 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r67304 | file | 2007-06-05 12:22:30 -0300 (Tue, 05 Jun 2007) | 2 lines

Only muck with the thread structure if an idle one was found/created.

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_iax2.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=67305&r1=67304&r2=67305
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Tue Jun  5 10:24:01 2007
@@ -974,8 +974,10 @@
 
 	/* this thread is not processing a full frame (since it is idle),
 	   so ensure that the field for the full frame call number is empty */
-	thread->ffcallno = 0;
-	memset(&thread->ffsin, 0, sizeof(thread->ffsin));
+	if (thread) {
+		thread->ffcallno = 0;
+		memset(&thread->ffsin, 0, sizeof(thread->ffsin));
+	}
 
 	return thread;
 }