summaryrefslogtreecommitdiff
path: root/navit/maptool/misc.c
diff options
context:
space:
mode:
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2010-05-02 15:00:54 +0000
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2010-05-02 15:00:54 +0000
commitad3081d2305307bacc727307b85efe89e77845ff (patch)
treeb465d80912b7e91e89346179fb8aa3366f7413c1 /navit/maptool/misc.c
parenta75c7f57084452f1fe6b7a0d410931f20571b6c1 (diff)
downloadnavit-ad3081d2305307bacc727307b85efe89e77845ff.tar.gz
Fix:maptool:Don't crash on NULL strings
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3220 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/maptool/misc.c')
-rw-r--r--navit/maptool/misc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/navit/maptool/misc.c b/navit/maptool/misc.c
index 73c3d9545..541a46fe2 100644
--- a/navit/maptool/misc.c
+++ b/navit/maptool/misc.c
@@ -113,8 +113,10 @@ phase1_map(GList *maps, FILE *out_ways, FILE *out_nodes)
while (item_attr_get(item, attr_any, &attr)) {
if (attr.type >= attr_type_string_begin && attr.type <= attr_type_string_end) {
attr.u.str=map_convert_string(maps->data, attr.u.str);
- item_bin_add_attr(item_bin, &attr);
- map_convert_free(attr.u.str);
+ if (attr.u.str) {
+ item_bin_add_attr(item_bin, &attr);
+ map_convert_free(attr.u.str);
+ }
} else
item_bin_add_attr(item_bin, &attr);
}