diff --git a/coreapi/chat.c b/coreapi/chat.c
index 7aa596566..babd3e82c 100644
--- a/coreapi/chat.c
+++ b/coreapi/chat.c
@@ -477,8 +477,8 @@ void linphone_core_message_received(LinphoneCore *lc, SalOp *op, const SalMessag
 								while (contentType[contentTypeIndex]!='/' && contentType[contentTypeIndex]!='\0') {
 									contentTypeIndex++;
 								}
-								msg->file_transfer_information->type = strndup((char *)contentType, contentTypeIndex);
-								msg->file_transfer_information->subtype = strdup(((char *)contentType+contentTypeIndex+1));
+								msg->file_transfer_information->type = ms_strdup((char *)contentType, contentTypeIndex);
+								msg->file_transfer_information->subtype = ms_strdup(((char *)contentType+contentTypeIndex+1));
 								xmlFree(contentType);
 							}
 							if (!xmlStrcmp(cur->name, (const xmlChar *)"data")) {
diff --git a/mediastreamer2 b/mediastreamer2
index 8b80c5023..ff45699c7 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 8b80c5023cabeb400826104b5641a9a6917ab4cf
+Subproject commit ff45699c79c09eb2f57aa07d8e63c20e66e35073