serial: Check event ptr before using.

[libsigrok.git] / src / serial.c

diff --git a/src/serial.c b/src/serial.c
index 959413b650ffcdce338ec2c13082afeae924033c..25e2b97b3ce63ef30e04317e50c9e3b7303462f2 100644 (file)
--- a/src/serial.c
+++ b/src/serial.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <libserialport.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 /** @cond PRIVATE */
@@ -843,6 +843,9 @@ SR_PRIV int serial_source_remove(struct sr_session *session,
 {
        unsigned int i;
 
+       if (!serial->event_set)
+               return SR_OK;
+
        for (i = 0; i < serial->event_set->count; i++)
                if (sr_session_source_remove_pollfd(session, &serial->pollfds[i]) != SR_OK)
                        return SR_ERR;