From: Patrik Flykt Date: Thu, 28 Jun 2012 11:20:57 +0000 (+0300) Subject: main: Dynamically allocate default blacklist array, free on exit X-Git-Tag: 2.0_alpha~5 X-Git-Url: http://review.tizen.org/git/?p=framework%2Fconnectivity%2Fconnman.git;a=commitdiff_plain;h=228d8b7833f39e1133411f339e87ab5bd32c5fc7 main: Dynamically allocate default blacklist array, free on exit --- diff --git a/src/main.c b/src/main.c index 717f1cd..5c206e7 100644 --- a/src/main.c +++ b/src/main.c @@ -160,7 +160,8 @@ static void parse_config(GKeyFile *config) if (config == NULL) { connman_settings.auto_connect = parse_service_types(default_auto_connect, 3); - connman_settings.blacklisted_interfaces = default_blacklist; + connman_settings.blacklisted_interfaces = + g_strdupv(default_blacklist); return; } @@ -236,7 +237,8 @@ static void parse_config(GKeyFile *config) if (error == NULL) connman_settings.blacklisted_interfaces = interfaces; else - connman_settings.blacklisted_interfaces = default_blacklist; + connman_settings.blacklisted_interfaces = + g_strdupv(default_blacklist); g_clear_error(&error); } @@ -604,6 +606,7 @@ int main(int argc, char *argv[]) g_free(connman_settings.auto_connect); g_free(connman_settings.preferred_techs); g_strfreev(connman_settings.fallback_nameservers); + g_strfreev(connman_settings.blacklisted_interfaces); g_free(option_debug);