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: https://origsvn.digium.com/svn/asterisk/trunk@328612 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
23140a044e
commit
8888df3a23
1 changed files with 5 additions and 0 deletions
|
@ -4266,6 +4266,11 @@ static int sip_setoption(struct ast_channel *chan, int option, void *data, int d
|
||||||
int res = -1;
|
int res = -1;
|
||||||
struct sip_pvt *p = chan->tech_pvt;
|
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);
|
sip_pvt_lock(p);
|
||||||
|
|
||||||
switch (option) {
|
switch (option) {
|
||||||
|
|
Loading…
Reference in a new issue