From 9ea9dcadbd06bdc90cffc1e0e95d4e5d1c48fd8e Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 29 Sep 2011 11:45:25 +0200
Subject: [PATCH] fix crash in linphone_core_get_nat_address_resolved() when
 nat_address is null

---
 coreapi/linphonecore.c | 2 ++
 mediastreamer2         | 2 +-
 oRTP                   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index fff77468b..a22959a18 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -3162,6 +3162,8 @@ const char *linphone_core_get_nat_address_resolved(LinphoneCore *lc)
 	int error;
 	char ipstring [INET6_ADDRSTRLEN];
 
+	if (lc->net_conf.nat_address==NULL) return NULL;
+	
 	if (parse_hostname_to_addr (lc->net_conf.nat_address, &ss, &ss_len)<0) {
 		return lc->net_conf.nat_address;
 	}
diff --git a/mediastreamer2 b/mediastreamer2
index 7b23259ec..5d3427468 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7b23259ecbe24579e7c30709763713d63be3aafa
+Subproject commit 5d342746830a6cc2aec1d3abb2d9abb898925292
diff --git a/oRTP b/oRTP
index 5b231b8e0..a56d7f752 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 5b231b8e0b9d82ccb93463ef4c2c28e15d68ba76
+Subproject commit a56d7f752717bea7d92cf63a6d187c2f6361d38b