[sr-dev] git:master:02d67f80: rtp_media_server: fix incompatible media format

Module: kamailio Branch: master Commit: 02d67f80580ca813b98198dcd408c3fcf0b7976a URL: https://github.com/kamailio/kamailio/commit/02d67f80580ca813b98198dcd408c3f… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2019-05-05T19:25:04Z rtp_media_server: fix incompatible media format --- Modified: src/modules/rtp_media_server/rms_dialog_info.c Modified: src/modules/rtp_media_server/rms_sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/02d67f80580ca813b98198dcd408c3f… Patch: https://github.com/kamailio/kamailio/commit/02d67f80580ca813b98198dcd408c3f… --- diff --git a/src/modules/rtp_media_server/rms_dialog_info.c b/src/modules/rtp_media_server/rms_dialog_info.c index f312cff298..4b1d8269b4 100644 --- a/src/modules/rtp_media_server/rms_dialog_info.c +++ b/src/modules/rtp_media_server/rms_dialog_info.c @@ -25,6 +25,7 @@ extern int in_rms_process; static void rms_action_free(rms_dialog_info_t *si) { rms_action_t *a, *tmp; + if (!si->action.prev) return; clist_foreach(&si->action, a, next) { tmp = a; diff --git a/src/modules/rtp_media_server/rms_sdp.c b/src/modules/rtp_media_server/rms_sdp.c index 304fee2b9c..55277987b4 100644 --- a/src/modules/rtp_media_server/rms_sdp.c +++ b/src/modules/rtp_media_server/rms_sdp.c @@ -186,7 +186,7 @@ PayloadType *rms_sdp_check_payload(rms_sdp_info_t *sdp) char *payloads = sdp->payloads.s; char *payload_type_number = strtok(payloads, " "); if(!payload_type_number) { - payload_type_destroy(pt); + shm_free(pt); // payload_type_destroy(pt); return NULL; } pt->type = atoi(payload_type_number); @@ -225,7 +225,7 @@ PayloadType *rms_sdp_check_payload(rms_sdp_info_t *sdp) break; payload_type_number = strtok(NULL, " "); if(!payload_type_number) { - payload_type_destroy(pt); + shm_free(pt); // payload_type_destroy(pt); return NULL; } pt->type = atoi(payload_type_number);