diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2009-10-14 16:57:21 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2009-10-15 16:15:17 -0500 |
| commit | 43e5152934442a185a5e990669f6b9f7175cbc5a (patch) | |
| tree | 3a136dd8879e2373af3a4e5a2bdbba8715b7374b /gatchat/gatmux.c | |
| parent | 20dc22a6c40c4f594a7086b027bede758af89d88 (diff) | |
| download | ofono-43e5152934442a185a5e990669f6b9f7175cbc5a.tar.bz2 | |
Fix: Do not leak chat references in case of error
Diffstat (limited to 'gatchat/gatmux.c')
| -rw-r--r-- | gatchat/gatmux.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/gatchat/gatmux.c b/gatchat/gatmux.c index 0fe3ecb3..def3bc23 100644 --- a/gatchat/gatmux.c +++ b/gatchat/gatmux.c @@ -695,6 +695,16 @@ GIOChannel *g_at_mux_create_channel(GAtMux *mux) return channel; } +static void msd_free(gpointer user_data) +{ + struct mux_setup_data *msd = user_data; + + if (msd->chat) + g_at_chat_unref(msd->chat); + + g_free(msd); +} + static void mux_setup_cb(gboolean ok, GAtResult *result, gpointer user_data) { struct mux_setup_data *msd = user_data; @@ -709,7 +719,6 @@ static void mux_setup_cb(gboolean ok, GAtResult *result, gpointer user_data) channel = g_io_channel_ref(channel); g_at_chat_shutdown(msd->chat); - g_at_chat_unref(msd->chat); flags = g_io_channel_get_flags(channel) | G_IO_FLAG_NONBLOCK; g_io_channel_set_flags(channel, flags, NULL); @@ -815,14 +824,15 @@ static void mux_query_cb(gboolean ok, GAtResult *result, gpointer user_data) goto error; nmsd = g_memdup(msd, sizeof(struct mux_setup_data)); + g_at_chat_ref(nmsd->chat); sprintf(buf, "AT+CMUX=%u,0,%u,%u", msd->mode, speed, msd->frame_size); if (g_at_chat_send(msd->chat, buf, none_prefix, - mux_setup_cb, nmsd, g_free) > 0) + mux_setup_cb, nmsd, msd_free) > 0) return; - g_free(nmsd); + msd_free(nmsd); error: msd->func(NULL, msd->user); @@ -851,11 +861,11 @@ gboolean g_at_mux_setup_gsm0710(GAtChat *chat, msd->destroy = destroy; if (g_at_chat_send(chat, "AT+CMUX=?", cmux_prefix, - mux_query_cb, msd, g_free) > 0) + mux_query_cb, msd, msd_free) > 0) return TRUE; if (msd) - g_free(msd); + msd_free(msd); return FALSE; } |