fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-01 17:40:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

modem: fix a periodic use-after-free crash poking ModemManager

Browse source 
See https://bugs.freedesktop.org/show_bug.cgi?id=41339 for a backtrace
and more info.
This commit is contained in:
Dan Williams 2011-09-29 11:14:48 -05:00
parent e189b87406
commit c9119c7599
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/modem-manager/nm-modem-manager.c
View file

@ -29,6 +29,7 @@
#include "nm-dbus-manager.h"
#include "nm-modem-types.h"
#include "nm-marshal.h"
#include "nm-dbus-glib-types.h"
#define MODEM_POKE_INTERVAL 120
@ -235,6 +236,23 @@ modem_removed (DBusGProxy *proxy, const char *path, gpointer user_data)
}
}
static void
mm_poke_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
{
GPtrArray *modems;
int i;
if (dbus_g_proxy_end_call (proxy, call, NULL,
DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH, &modems,
G_TYPE_INVALID)) {
/* Don't care about the returned value, just free it */
for (i = 0; i < modems->len; i++)
g_free ((char *) g_ptr_array_index (modems, i));
g_ptr_array_free (modems, TRUE);
}
g_object_unref (proxy);
}
static gboolean
poke_modem_cb (gpointer user_data)
{
@ -242,6 +260,7 @@ poke_modem_cb (gpointer user_data)
NMModemManagerPrivate *priv = NM_MODEM_MANAGER_GET_PRIVATE (self);
DBusGConnection *g_connection;
DBusGProxy *proxy;
DBusGProxyCall *call;
g_connection = nm_dbus_manager_get_connection (priv->dbus_mgr);
proxy = dbus_g_proxy_new_for_name (g_connection,
@ -249,9 +268,13 @@ poke_modem_cb (gpointer user_data)
MM_DBUS_PATH,
MM_DBUS_INTERFACE);
dbus_g_proxy_call_no_reply (proxy, "EnumerateDevices", G_TYPE_INVALID);
g_object_unref (proxy);
call = dbus_g_proxy_begin_call_with_timeout (proxy,
"EnumerateDevices",
mm_poke_cb,
NULL,
NULL,
5000,
G_TYPE_INVALID);
return TRUE;
}