From: Richard Mudgett Date: Tue, 12 Aug 2014 23:45:17 +0000 (+0000) Subject: chan_sip: Fix type mismatch when the format is changed. X-Git-Tag: 14.0.0-beta1~1758 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=969982b878596000a45842816f415f2dd8e2a6b1;p=thirdparty%2Fasterisk.git chan_sip: Fix type mismatch when the format is changed. Symptom is most likely an invalid ao2 object bad magic number message or a less likely crash. ........ Merged revisions 420881 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@420882 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 97ee23e2ed..f28ad58218 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4736,12 +4736,12 @@ static int sip_setoption(struct ast_channel *chan, int option, void *data, int d switch (option) { case AST_OPTION_FORMAT_READ: if (p->rtp) { - res = ast_rtp_instance_set_read_format(p->rtp, (struct ast_format *) data); + res = ast_rtp_instance_set_read_format(p->rtp, *(struct ast_format **) data); } break; case AST_OPTION_FORMAT_WRITE: if (p->rtp) { - res = ast_rtp_instance_set_write_format(p->rtp, (struct ast_format *) data); + res = ast_rtp_instance_set_write_format(p->rtp, *(struct ast_format **) data); } break; case AST_OPTION_DIGIT_DETECT: