fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-06-20 05:58:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

* improve the handling of auth_items to

Browse source 
prevent possible double g_free (Fixed bug #344970)


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1829 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Antony Mee 2006-06-15 11:36:14 +00:00
parent ab09843c9f
commit 8456fb551f
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
vpn-daemons/pptp/src/nm-ppp-starter.c
View file

@ -957,7 +957,7 @@ static gboolean nm_ppp_store_auth_info (NmPPPData *data,
g_return_val_if_fail (auth_items != NULL, FALSE);
g_return_val_if_fail (num_auth_items >= 1, FALSE);
data->auth_items = (char **)g_new0(char *, num_auth_items);
data->auth_items = (char **)g_new0(char *, num_auth_items+1);
g_return_val_if_fail (data->auth_items != NULL, FALSE);
for (i=0;i<num_auth_items;i++) {
@ -1335,7 +1335,10 @@ static void nm_ppp_dbus_process_helper_ip4_config (DBusConnection *con, DBusMess
return;
/* If IP is up then we don't need to leave the auth info lying around */
g_strfreev (data->auth_items);
if (data->auth_items)
g_strfreev (data->auth_items);
data->auth_items = NULL;
data->num_auth_items=-1;
nm_ppp_cancel_helper_timer (data);
@ -1645,12 +1648,10 @@ int main( int argc, char *argv[] )
g_main_loop_unref (vpn_data->loop);
for (i=0;i<vpn_data->num_auth_items;i++) {
g_free(vpn_data->auth_items[i]);
}
g_free((char *)vpn_data->auth_items);
g_free (vpn_data->str_ip4_vpn_gateway);
g_free (vpn_data);
if (vpn_data->auth_items)
g_strfreev (vpn_data->auth_items);
if (vpn_data->str_ip4_vpn_gateway) g_free (vpn_data->str_ip4_vpn_gateway);
if (vpn_data) g_free (vpn_data);
exit (0);
}