diff options
| author | Jason Parker <jparker@digium.com> | 2008-04-14 18:34:17 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2008-04-14 18:34:17 +0000 |
| commit | 6e6d6f2e103e377e25eb96b2402a3f8c75daddbc (patch) | |
| tree | 92704c900572b0c9bfd3656a987bfc739aedd15d /channels | |
| parent | 0270776ca50924ad36885984741b4573737cfc32 (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@114121 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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 140c06fa3..a3f6ee6f3 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -1148,7 +1148,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; |