diff options
| author | Keith Packard <keithp@keithp.com> | 2014-02-08 20:00:56 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-02-08 20:13:38 -0800 |
| commit | 8ddbbdcdc498a19ebf4a440bbf5d73b6538e0a57 (patch) | |
| tree | b562a728b9c6825e2b014c85ef4aba450f020754 /src | |
| parent | 324073d14ed8215b74d9df51f2229827cd4401d0 (diff) | |
altos: Don't write more than 12 sat infos in ublox driver
This was overwriting memory past the end of the ao_gps_tracking_data
array, which isn't a good idea.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/ao_gps_ublox.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/drivers/ao_gps_ublox.c b/src/drivers/ao_gps_ublox.c index 4fb90746..01169522 100644 --- a/src/drivers/ao_gps_ublox.c +++ b/src/drivers/ao_gps_ublox.c @@ -746,18 +746,20 @@ ao_gps(void) __reentrant ao_gps_tracking_data.channels = 0; struct ao_telemetry_satellite_info *dst = &ao_gps_tracking_data.sats[0]; + struct nav_svinfo_sat *src = &nav_svinfo_sat[0]; for (i = 0; i < nav_svinfo_nsat; i++) { - struct nav_svinfo_sat *src = &nav_svinfo_sat[i]; - if (!(src->flags & (1 << NAV_SVINFO_SAT_FLAGS_UNHEALTHY)) && src->quality >= NAV_SVINFO_SAT_QUALITY_ACQUIRED) { - dst->svid = src->svid; - dst->c_n_1 = src->cno; - dst++; - ao_gps_tracking_data.channels++; + if (ao_gps_tracking_data.channels < AO_TELEMETRY_SATELLITE_MAX_SAT) { + dst->svid = src->svid; + dst->c_n_1 = src->cno; + dst++; + ao_gps_tracking_data.channels++; + } } + src++; } ao_mutex_put(&ao_gps_mutex); |