summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Dankov <tryagain@navit-project.org>2016-07-11 23:51:39 +0300
committerMichael Dankov <tryagain@navit-project.org>2016-07-12 00:01:03 +0300
commit21465d9464d7b86747adee20b75f8a862497ef50 (patch)
tree088cf168d4130c47cbb1fea3a4f3c94913e67d30
parent42b5393baaafbe793674282da716e8ba74d0ccb3 (diff)
downloadnavit-21465d9464d7b86747adee20b75f8a862497ef50.tar.gz
fix:core:Prevent crash on exit if csv map was usedR6708
Do not attempt to free(attr->data) of attr_item_type attribute, it holds a number, not a pointer.
-rw-r--r--navit/attr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/navit/attr.c b/navit/attr.c
index 4ca3868e6..24b6cbe6a 100644
--- a/navit/attr.c
+++ b/navit/attr.c
@@ -835,7 +835,8 @@ attr_free_content_do(struct attr *attr)
obj->func->unref(obj);
}
if (!(attr->type >= attr_type_int_begin && attr->type <= attr_type_int_end) &&
- !(attr->type >= attr_type_object_begin && attr->type <= attr_type_object_end))
+ !(attr->type >= attr_type_object_begin && attr->type <= attr_type_object_end) &&
+ attr->type != attr_item_type)
g_free(attr->u.data);
}