sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

gatio: Get re-entrancy correct

This commit is contained in:
Denis Kenzior 2010-04-27 14:48:11 -05:00
parent c614254ae9
commit 204814da05
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gatchat/gatio.c
View File

@ -61,11 +61,10 @@ static void read_watcher_destroy_notify(gpointer user_data)
io->channel = NULL;
io->read_watch = 0;
if (io->user_disconnect)
io->user_disconnect(io->user_disconnect_data);
if (io->destroyed)
g_free(io);
else if (io->user_disconnect)
io->user_disconnect(io->user_disconnect_data);
}
static gboolean received_data(GIOChannel *channel, GIOCondition cond,
@ -239,6 +238,10 @@ gboolean g_at_io_shutdown(GAtIO *io)
if (io->channel == NULL)
return FALSE;
/* Don't trigger user disconnect on shutdown */
io->user_disconnect = NULL;
io->user_disconnect_data = NULL;
if (io->read_watch > 0)
g_source_remove(io->read_watch);