summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormvglasow <michael -at- vonglasow.com>2018-02-02 23:32:35 +0100
committermvglasow <michael -at- vonglasow.com>2018-02-02 23:32:35 +0100
commit70e5cc5fa4a06428a3d4d136bca24c958fb32e62 (patch)
tree3ea45963108f137b86aceee8794729d8e843015e
parent5d1a0fa213b41320f72926fac46556e4368bc730 (diff)
downloadnavit-70e5cc5fa4a06428a3d4d136bca24c958fb32e62.tar.gz
Fix:core:Fix some use-after-free errors
Signed-off-by: mvglasow <michael -at- vonglasow.com>
-rw-r--r--navit/traffic.c4
-rw-r--r--navit/util.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/navit/traffic.c b/navit/traffic.c
index 66f68efd6..7012ee6a4 100644
--- a/navit/traffic.c
+++ b/navit/traffic.c
@@ -3022,6 +3022,8 @@ static void traffic_loop(struct traffic * this_) {
traffic_message_destroy(stored_msg);
}
+ dbg(lvl_debug, "%d message(s) expired\n", g_list_length(msgs_to_remove));
+
g_list_free(msgs_to_remove);
}
@@ -3032,8 +3034,6 @@ static void traffic_loop(struct traffic * this_) {
/* dump message store if new messages have been received */
traffic_dump_messages_to_xml(this_);
- dbg(lvl_debug, "%d message(s) expired\n", g_list_length(msgs_to_remove));
-
/* trigger redraw if segments have changed */
if ((update_status & MESSAGE_UPDATE_SEGMENTS) && (navit_get_ready(this_->navit) == 3))
navit_draw_async(this_->navit, 1);
diff --git a/navit/util.c b/navit/util.c
index 6cb722845..06d137c43 100644
--- a/navit/util.c
+++ b/navit/util.c
@@ -582,13 +582,13 @@ time_t mkgmtime(struct tm * pt) {
ret = mktime(pti);
+ dbg(lvl_debug, "time %ld (%02d-%02d-%02d %02d:%02d:%02d)\n", ret, pti->tm_year, pti->tm_mon, pti->tm_mday,
+ pti->tm_hour, pti->tm_min, pti->tm_sec);
+
g_free(pti);
g_free(pgt);
g_free(plt);
- dbg(lvl_debug, "time %ld (%02d-%02d-%02d %02d:%02d:%02d)\n", ret, pti->tm_year, pti->tm_mon, pti->tm_mday,
- pti->tm_hour, pti->tm_min, pti->tm_sec);
-
return ret;
}