[asterisk-commits] rmudgett: trunk r420882 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Aug 12 18:45:17 2014
New Revision: 420882

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=420882
Log:
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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-13-merged (original)
+++ branch-13-merged Tue Aug 12 18:45:17 2014
@@ -1,1 +1,1 @@
-/branches/13:1-420494,420514,420534,420536,420538,420562,420577,420592,420609,420624,420639,420657,420717,420742,420758,420779,420796,420803,420808,420837,420856,420879
+/branches/13:1-420494,420514,420534,420536,420538,420562,420577,420592,420609,420624,420639,420657,420717,420742,420758,420779,420796,420803,420808,420837,420856,420879,420881

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=420882&r1=420881&r2=420882
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Aug 12 18:45:17 2014
@@ -4736,12 +4736,12 @@
 	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: