From 5de1f11f0573fbb0b444e2e3203a9392fc99c701 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 11 Feb 2011 16:30:59 +0100
Subject: [PATCH] fix bad free and stupid abort()
---
coreapi/sal.c | 1 -
coreapi/sal_eXosip2.c | 2 +-
coreapi/sal_eXosip2_sdp.c | 3 ---
mediastreamer2 | 2 +-
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/coreapi/sal.c b/coreapi/sal.c
index ec8a6fc6d1..b25f394513 100644
--- a/coreapi/sal.c
+++ b/coreapi/sal.c
@@ -150,7 +150,6 @@ static bool_t payload_list_equals(const MSList *l1, const MSList *l2){
}
if (e1!=NULL || e2!=NULL){
/*means one list is longer than the other*/
- abort();
return FALSE;
}
return TRUE;
diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index 61c7c494d0..2eb9a0c329 100644
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -2030,7 +2030,7 @@ int sal_call_update(SalOp *h, const char *subject){
osip_message_t *reinvite=NULL;
eXosip_lock();
- if(eXosip_call_build_request(h->did,"INVITE",&reinvite) != OSIP_SUCCESS || reinvite==NULL){
+ if(eXosip_call_build_request(h->did,"INVITE",&reinvite) != 0 || reinvite==NULL){
eXosip_unlock();
return -1;
}
diff --git a/coreapi/sal_eXosip2_sdp.c b/coreapi/sal_eXosip2_sdp.c
index 848e3070c9..70443c722a 100644
--- a/coreapi/sal_eXosip2_sdp.c
+++ b/coreapi/sal_eXosip2_sdp.c
@@ -328,9 +328,6 @@ int sdp_to_media_description(sdp_message_t *msg, SalMediaDescription *desc){
stream->type=SalVideo;
}else {
stream->type=SalOther;
- if (stream->typeother){
- ms_free(stream->typeother);
- }
strncpy(stream->typeother,mtype,sizeof(stream->typeother)-1);
}
for(j=0;(sbw=sdp_message_bandwidth_get(msg,i,j))!=NULL;++j){
diff --git a/mediastreamer2 b/mediastreamer2
index cf11f11804..b9a6dad733 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit cf11f11804476639cf4aa578cb5e04976b09f5c3
+Subproject commit b9a6dad7339175e894d1a0f291ccb5d1143e3199
--
GitLab