From: <te...@us...> - 2011-02-20 23:04:58
|
Revision: 4229 http://navit.svn.sourceforge.net/navit/?rev=4229&view=rev Author: tegzed Date: 2011-02-20 23:04:51 +0000 (Sun, 20 Feb 2011) Log Message: ----------- Fix:map/csv:added some NULL checks Modified Paths: -------------- trunk/navit/navit/map/csv/csv.c Modified: trunk/navit/navit/map/csv/csv.c =================================================================== --- trunk/navit/navit/map/csv/csv.c 2011-02-20 21:25:44 UTC (rev 4228) +++ trunk/navit/navit/map/csv/csv.c 2011-02-20 23:04:51 UTC (rev 4229) @@ -85,6 +85,11 @@ { struct map_rect_priv *mr=priv_data; + if(!mr || !mr->curr_item || !mr->curr_item->data) { + attr = NULL; + return 0; + } + GList* attr_list = ((struct quadtree_data*)(((struct quadtree_item*)(mr->curr_item->data))->data))->attr_list; if (attr_type == attr_any) { } @@ -129,9 +134,11 @@ mr->item.priv_data=mr; //convert selection to geo - transform_to_geo(projection_mg, &sel->u.c_rect.lu, &lu); - transform_to_geo(projection_mg, &sel->u.c_rect.rl, &rl); - quadtree_find_rect_items(map->tree_root, lu.lng, rl.lng, rl.lat, lu.lat, &res); + if(sel) { + transform_to_geo(projection_mg, &sel->u.c_rect.lu, &lu); + transform_to_geo(projection_mg, &sel->u.c_rect.rl, &rl); + quadtree_find_rect_items(map->tree_root, lu.lng, rl.lng, rl.lat, lu.lat, &res); + } mr->query_result = res; mr->curr_item = res; return mr; @@ -148,7 +155,9 @@ map_rect_get_item_csv(struct map_rect_priv *mr) { if(mr->bStarted) { - mr->curr_item = g_list_next(mr->curr_item); + if(mr->curr_item) { + mr->curr_item = g_list_next(mr->curr_item); + } } else { mr->bStarted = 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |