dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 328611 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328611 | markm | 2011-07-18 08:56:49 -0400 (Mon, 18 Jul 2011) | 15 lines
  
  Merged revisions 328608 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328608 | markm | 2011-07-18 08:35:57 -0400 (Mon, 18 Jul 2011) | 9 lines
    
    If the sip private structure is null, sip_setoption() will defref the null pointer and crash.
    
    Ideally, sip_setoption shouldn't be called if there is a lack of a sip private structure.  But this will fix a crash.
    
    (closes issue ASTERISK-17909)
    Reported by: Mark Murawski
    Tested by: Mark Murawski
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328612 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markm 2011-07-18 12:58:02 +00:00
parent 79206e6052
commit 36b69d0c2c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_sip.c
View File

@ -4266,6 +4266,11 @@ static int sip_setoption(struct ast_channel *chan, int option, void *data, int d
int res = -1;
struct sip_pvt *p = chan->tech_pvt;
if (!p) {
ast_log(LOG_ERROR, "Attempt to Ref a null pointer. sip private structure is gone!\n");
return -1;
}
sip_pvt_lock(p);
switch (option) {