diff options
| author | Sebastian Leske <sebastian.leske@sleske.name> | 2015-09-14 00:44:20 +0200 |
|---|---|---|
| committer | Sebastian Leske <sebastian.leske@sleske.name> | 2015-09-14 00:44:20 +0200 |
| commit | 00c89f42a7941ca62fc12cfaffd553946fd7e01b (patch) | |
| tree | 656dea17425e3930550df56f854cfc493b7cd93b | |
| parent | 6558a05c70330c6566ad8c181bec35baf924f289 (diff) | |
| download | navit-R6268.tar.gz | |
Fix crash in osd_odometer_draw without vehicle.R6268
In osd_odometer_draw, check the return value of navit_get_attr, so we
can return early if no vehicle is available.
| -rw-r--r-- | navit/osd/core/osd_core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/navit/osd/core/osd_core.c b/navit/osd/core/osd_core.c index 19e2324e2..ab522f97f 100644 --- a/navit/osd/core/osd_core.c +++ b/navit/osd/core/osd_core.c @@ -674,13 +674,11 @@ static void osd_odometer_draw(struct osd_priv_common *opc, struct navit *nav, st char buffer2[256+1]=""; if(nav) { - navit_get_attr(nav, attr_vehicle, &vehicle_attr, NULL); + if (navit_get_attr(nav, attr_vehicle, &vehicle_attr, NULL)) + curr_vehicle=vehicle_attr.u.vehicle; if (navit_get_attr(nav, attr_imperial, &imperial_attr, NULL)) imperial=imperial_attr.u.num; } - if (vehicle_attr.u.vehicle) { - curr_vehicle = vehicle_attr.u.vehicle; - } if(0==curr_vehicle) return; |