diff options
| author | Chris Kuethe <chris.kuethe@gmail.com> | 2009-06-24 02:11:43 +0000 |
|---|---|---|
| committer | Chris Kuethe <chris.kuethe@gmail.com> | 2009-06-24 02:11:43 +0000 |
| commit | 34f969bf19c96128419e5d34dc936aa3c8883efd (patch) | |
| tree | 8b99c6f6b8311083ac38b714c0034a7ae31be259 /driver_zodiac.c | |
| parent | f02abe34a21e3093dc309a1e976504eea25f0e91 (diff) | |
| download | gpsd-34f969bf19c96128419e5d34dc936aa3c8883efd.tar.gz | |
Fix a segfault in the Zodiac driver.
After taunting the fates for 4 years (no segfaults), Steve Clift finally
found one by hooking up a Polaris - the civilian version of the DAGR. It
emits a strange variant of zodiac message 1003 which doesn't parse the way
we expect it to. This adds a little bit of plausibility checking.
Diffstat (limited to 'driver_zodiac.c')
| -rw-r--r-- | driver_zodiac.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/driver_zodiac.c b/driver_zodiac.c index ca8cd041..b4b07848 100644 --- a/driver_zodiac.c +++ b/driver_zodiac.c @@ -258,7 +258,14 @@ static gps_mask_t handle1002(struct gps_device_t *session) static gps_mask_t handle1003(struct gps_device_t *session) { - int i; + int i, n; + + /* The Polaris (and probably the DAGR) emit some strange variant of + * this message which causes gpsd to crash filtering on impossible + * number of satellites avoids this */ + n = (int)getzword(14); + if ((n < 0) || (n >12)) + return 0; /* ticks = getzlong(6); */ /* sequence = getzword(8); */ @@ -267,7 +274,7 @@ static gps_mask_t handle1003(struct gps_device_t *session) session->gpsdata.hdop = (unsigned int)getzword(11) * 1e-2; session->gpsdata.vdop = (unsigned int)getzword(12) * 1e-2; session->gpsdata.tdop = (unsigned int)getzword(13) * 1e-2; - session->gpsdata.satellites = (int)getzword(14); + session->gpsdata.satellites = n; for (i = 0; i < ZODIAC_CHANNELS; i++) { if (i < session->gpsdata.satellites) { |