From 668a7fffa9dc075f4a563fe22701cbf2be30c8c9 Mon Sep 17 00:00:00 2001 From: waltje Date: Tue, 5 Dec 2017 13:37:06 -0500 Subject: [PATCH] Fixed closing of non-open serial mouse (Altheos bug report.) --- src/mouse_serial.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/mouse_serial.c b/src/mouse_serial.c index df5271ced..0d8d4a586 100644 --- a/src/mouse_serial.c +++ b/src/mouse_serial.c @@ -10,7 +10,7 @@ * * TODO: Add the Genius Serial Mouse. * - * Version: @(#)mouse_serial.c 1.0.14 2017/12/03 + * Version: @(#)mouse_serial.c 1.0.15 2017/12/05 * * Author: Fred N. van Kempen, */ @@ -184,8 +184,10 @@ sermouse_poll(int x, int y, int z, int b, void *priv) #endif /* Send the packet to the bottom-half of the attached port. */ - for (b=0; bserial, buff[b]); + if (dev->serial != NULL) { + for (b=0; bserial, buff[b]); + } return(0); } @@ -197,8 +199,10 @@ sermouse_close(void *priv) mouse_t *dev = (mouse_t *)priv; /* Detach serial port from the mouse. */ - dev->serial->rcr_callback = NULL; - dev->serial->rcr_callback_p = NULL; + if (dev->serial != NULL) { + dev->serial->rcr_callback = NULL; + dev->serial->rcr_callback_p = NULL; + } free(dev); }