Hi Antoine,
On 10/04/2016 02:42 AM, Antoine Aubert wrote:
In case of invalid IO, read_watch is not reset. Fix crash on destroy
gatmux.
Signed-off-by: Antoine Aubert<[email protected]>
We don't use Signed-off-by here. See HACKING, Submitting Patches section.
---
gatchat/gatmux.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/gatchat/gatmux.c b/gatchat/gatmux.c
index 9beeece..896ddff 100644
--- a/gatchat/gatmux.c
+++ b/gatchat/gatmux.c
@@ -186,8 +186,10 @@ static gboolean received_data(GIOChannel *channel,
GIOCondition cond,
GIOStatus status;
gsize bytes_read;
- if (cond & G_IO_NVAL)
+ if (cond & G_IO_NVAL) {
+ mux->read_watch = 0;
return FALSE;
+ }
Good catch on this one. However it might be easier solved by using a
watch destroy notify function. E.g. in g_at_mux_start():
mux->read_watch = g_io_add_watch_full(mux->channel,
G_PRIORITY_DEFAULT,
G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
received_data, mux, NULL);
The last NULL parameter should be set to a new function that resets the
mux->read_watch to 0. Similar to write_watcher_destroy_notify.
debug(mux, "received data");
@@ -223,14 +225,20 @@ static gboolean received_data(GIOChannel *channel,
GIOCondition cond,
}
}
- if (cond & (G_IO_HUP | G_IO_ERR))
+ if (cond & (G_IO_HUP | G_IO_ERR)) {
+ mux->read_watch = 0;
return FALSE;
+ }
- if (status != G_IO_STATUS_NORMAL && status != G_IO_STATUS_AGAIN)
+ if (status != G_IO_STATUS_NORMAL && status != G_IO_STATUS_AGAIN) {
+ mux->read_watch = 0;
return FALSE;
+ }
- if (mux->buf_used == sizeof(mux->buf))
+ if (mux->buf_used == sizeof(mux->buf)) {
+ mux->read_watch = 0;
return FALSE;
+ }
That way all these redundant statements are handled by the destroy notify.
return TRUE;
}
--
2.7.4
Care to resubmit?
Regards,
-Denis
_______________________________________________
ofono mailing list
[email protected]
https://lists.ofono.org/mailman/listinfo/ofono
