summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre GRANDIN <grandinp@altern.org>2015-08-26 16:43:09 -0700
committerPierre GRANDIN <grandinp@altern.org>2015-08-26 16:43:09 -0700
commit02dc0d73408da5d6fd56cb1fe63ab33db9c1fca5 (patch)
treee1bc1fb495b24a27de7d4e6710c9ae4603fa3f6c
parent0d9545cbe06728c949b02091ddfd0790be1ca859 (diff)
downloadnavit-multithreaded_android_graphics.tar.gz
Fixed trac 1316, Use-after-free bug in binfile.cmultithreaded_android_graphics
-rw-r--r--navit/map/binfile/binfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/navit/map/binfile/binfile.c b/navit/map/binfile/binfile.c
index 5d2cf172e..4ca4c6bf5 100644
--- a/navit/map/binfile/binfile.c
+++ b/navit/map/binfile/binfile.c
@@ -2129,7 +2129,6 @@ binmap_search_new(struct map_priv *map, struct item *item, struct attr *search,
town = map_rect_get_item_byid_binfile(map_rec, map->last_searched_town_id_hi, map->last_searched_town_id_lo);
if (town)
msp->mr = binmap_search_street_by_place(map, town, &c, &msp->ms, &msp->boundaries);
- map_rect_destroy_binfile(map_rec);
if (msp->boundaries)
dbg(lvl_debug, "using map town boundaries\n");
if (!msp->boundaries && town)
@@ -2138,6 +2137,7 @@ binmap_search_new(struct map_priv *map, struct item *item, struct attr *search,
if (msp->boundaries)
dbg(lvl_debug, "using estimated boundaries\n");
}
+ map_rect_destroy_binfile(map_rec);
/* start searching in area around the street segment even if town boundaries are available */
msp->mr=binmap_search_housenumber_by_estimate(map, &c, &msp->ms);
msp->mode = 2;