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

gathdlc: Don't crash if unreffed in callback

This commit is contained in:
Denis Kenzior 2010-06-18 12:23:10 -05:00
parent e2e17512e0
commit ab76f57cf9
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gatchat/gathdlc.c
View File

@ -64,6 +64,8 @@ struct _GAtHDLC {
GAtDebugFunc debugf; GAtDebugFunc debugf;
gpointer debug_data; gpointer debug_data;
int record_fd; int record_fd;
gboolean in_read_handler;
gboolean destroyed;
}; };
static void hdlc_record(int fd, gboolean in, guint8 *data, guint16 length) static void hdlc_record(int fd, gboolean in, guint8 *data, guint16 length)
@ -133,6 +135,8 @@ static void new_bytes(struct ring_buffer *rbuf, gpointer user_data)
hdlc_record(hdlc->record_fd, TRUE, buf, wrap); hdlc_record(hdlc->record_fd, TRUE, buf, wrap);
hdlc->in_read_handler = TRUE;
while (pos < len) { while (pos < len) {
if (hdlc->decode_escape == TRUE) { if (hdlc->decode_escape == TRUE) {
unsigned char val = *buf ^ HDLC_TRANS; unsigned char val = *buf ^ HDLC_TRANS;
@ -149,6 +153,9 @@ static void new_bytes(struct ring_buffer *rbuf, gpointer user_data)
hdlc->receive_func(hdlc->decode_buffer, hdlc->receive_func(hdlc->decode_buffer,
hdlc->decode_offset - 2, hdlc->decode_offset - 2,
hdlc->receive_data); hdlc->receive_data);
if (hdlc->destroyed)
goto out;
} }
hdlc->decode_fcs = HDLC_INITFCS; hdlc->decode_fcs = HDLC_INITFCS;
@ -169,6 +176,12 @@ static void new_bytes(struct ring_buffer *rbuf, gpointer user_data)
} }
ring_buffer_drain(rbuf, pos); ring_buffer_drain(rbuf, pos);
out:
hdlc->in_read_handler = FALSE;
if (hdlc->destroyed)
g_free(hdlc);
} }
GAtHDLC *g_at_hdlc_new_from_io(GAtIO *io) GAtHDLC *g_at_hdlc_new_from_io(GAtIO *io)
@ -267,7 +280,11 @@ void g_at_hdlc_unref(GAtHDLC *hdlc)
ring_buffer_free(hdlc->write_buffer); ring_buffer_free(hdlc->write_buffer);
g_free(hdlc->decode_buffer); g_free(hdlc->decode_buffer);
g_free(hdlc);
if (hdlc->in_read_handler)
hdlc->destroyed = TRUE;
else
g_free(hdlc);
} }
void g_at_hdlc_set_debug(GAtHDLC *hdlc, GAtDebugFunc func, gpointer user_data) void g_at_hdlc_set_debug(GAtHDLC *hdlc, GAtDebugFunc func, gpointer user_data)