diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-14 18:34:37 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-14 18:34:37 +0000 |
| commit | a468b0eef5987ed7ab89491824b92ce0963a81ec (patch) | |
| tree | 193048351b53719a05025bf6a79522b74c158e75 /channels | |
| parent | 2f26951db771319589184e71861e024b38489516 (diff) | |
Merged revisions 114121 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r114121 | qwell | 2008-04-14 13:34:17 -0500 (Mon, 14 Apr 2008) | 15 lines
Merged revisions 114120 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114120 | qwell | 2008-04-14 13:31:57 -0500 (Mon, 14 Apr 2008) | 7 lines
The call_token on the pvt can occasionally be NULL, causing a crash.
If it is NULL, we can skip this channel, since it can't the one we're looking for.
(closes issue #9299)
Reported by: vazir
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114122 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_h323.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c index 2b1ef51e7..97b7303cf 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -1151,7 +1151,7 @@ static struct oh323_pvt *find_call_locked(int call_reference, const char *token) while(pvt) { if (!pvt->needdestroy && ((signed int)pvt->cd.call_reference == call_reference)) { /* Found the call */ - if ((token != NULL) && (!strcmp(pvt->cd.call_token, token))) { + if ((token != NULL) && (pvt->cd.call_token != NULL) && (!strcmp(pvt->cd.call_token, token))) { ast_mutex_lock(&pvt->lock); ast_mutex_unlock(&iflock); return pvt; |