]> sjero.net Git - linphone/commitdiff
fix crash in linphone_core_get_nat_address_resolved() when nat_address is null
authorSimon Morlat <simon.morlat@linphone.org>
Thu, 29 Sep 2011 09:45:25 +0000 (11:45 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Thu, 29 Sep 2011 09:45:25 +0000 (11:45 +0200)
coreapi/linphonecore.c
mediastreamer2
oRTP

index fff77468b68c2821e28682c16c2f4693d37a2d6d..a22959a180558ae130da1bf5b6176f88451004af 100644 (file)
@@ -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;
        }
index 7b23259ecbe24579e7c30709763713d63be3aafa..5d342746830a6cc2aec1d3abb2d9abb898925292 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 7b23259ecbe24579e7c30709763713d63be3aafa
+Subproject commit 5d342746830a6cc2aec1d3abb2d9abb898925292
diff --git a/oRTP b/oRTP
index 5b231b8e0b9d82ccb93463ef4c2c28e15d68ba76..a56d7f752717bea7d92cf63a6d187c2f6361d38b 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 5b231b8e0b9d82ccb93463ef4c2c28e15d68ba76
+Subproject commit a56d7f752717bea7d92cf63a6d187c2f6361d38b