Repository : ssh://git@open-mesh.org/alfred
On branch : master
commit 71b36fa34beba4beecd2ce397e52b4a8e190a1dd Author: Sven Eckelmann sven@narfation.org Date: Wed Jun 25 13:35:58 2014 +0200
alfred-gpsd: Avoid underrun when reading from gpsd
The gpsd output reading function is ignoring \r characters. This is done by moving the current position (cnt) one position back in the character buffer. It is jumping to the -1 character (max number for size_t) when it was reading the first character at position 0. This is not problematic when the cnt is increased directly after it by 1. Overflows/underflows are defined for *unsigned* types and thus it just jumps back to 0.
Unfortunatelly, it is trying to access the memory for another check before increasing the position again. This check is done on memory outside of the buffer and therefore invalid.
Instead doing two check after each other, it is in this situation better to do both at once and just handle the current character.
Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de
71b36fa34beba4beecd2ce397e52b4a8e190a1dd gpsd/alfred-gpsd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index d6cdfd6..87943bd 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -315,15 +315,16 @@ static void gpsd_read_gpsd(struct globals *globals) return; }
- if (buf[cnt] == '\r') + switch (buf[cnt]) { + case '\r': cnt--; - - if (buf[cnt] == '\n') { + break; + case '\n': eol = true; buf[cnt] = '\0'; break; } - } while (cnt++ < sizeof(buf) - 1); + } while (cnt++ < sizeof(buf) - 1 && !eol);
if (!eol) { gps_close(&globals->gpsdata);