summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2007-06-05 15:24:01 +0000
committerJoshua Colp <jcolp@digium.com>2007-06-05 15:24:01 +0000
commit72cd0474f6a1b9ba5b0dbb8ec11efeb1d9d595a4 (patch)
tree41684553df6de848dcd57f9f8bf7f0df4adb3ef9
parentbcd0bf437acc0fe0535db40fa9407ba641ca6e63 (diff)
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. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67305 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_iax2.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index bfb7c2093..a090801ed 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -974,8 +974,10 @@ static struct iax2_thread *find_idle_thread(void)
/* 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;
}