From 117c833d57dc65f03e20a20ac0b1611990a7d9ce Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 10 Jul 2014 15:42:28 +0200 Subject: [PATCH] fix crash when proxy config done is call first --- coreapi/proxy.c | 4 ++-- tester/setup_tester.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/coreapi/proxy.c b/coreapi/proxy.c index fb8519c32..409ddb4a3 100644 --- a/coreapi/proxy.c +++ b/coreapi/proxy.c @@ -275,13 +275,13 @@ int linphone_proxy_config_set_route(LinphoneProxyConfig *obj, const char *route) bool_t linphone_proxy_config_check(LinphoneCore *lc, LinphoneProxyConfig *obj){ if (obj->reg_proxy==NULL){ - if (lc->vtable.display_warning) + if (lc && lc->vtable.display_warning) lc->vtable.display_warning(lc,_("The sip proxy address you entered is invalid, it must start with \"sip:\"" " followed by a hostname.")); return FALSE; } if (obj->reg_identity==NULL){ - if (lc->vtable.display_warning) + if (lc && lc->vtable.display_warning) lc->vtable.display_warning(lc,_("The sip identity you entered is invalid.\nIt should look like " "sip:username@proxydomain, such as sip:alice@example.net")); return FALSE; diff --git a/tester/setup_tester.c b/tester/setup_tester.c index 760cdf6bd..546042714 100644 --- a/tester/setup_tester.c +++ b/tester/setup_tester.c @@ -127,6 +127,8 @@ void linphone_proxy_config_address_equal_test() { void linphone_proxy_config_is_server_config_changed_test() { LinphoneProxyConfig* proxy_config = linphone_proxy_config_new(); + linphone_proxy_config_done(proxy_config); /*test done without edit*/ + linphone_proxy_config_set_identity(proxy_config,"sip:toto@titi"); linphone_proxy_config_edit(proxy_config); linphone_proxy_config_set_identity(proxy_config,"sips:toto@titi");