From 756e8fa4fd2062e1d1e614f1e7410e5435769591 Mon Sep 17 00:00:00 2001 From: Markus Koch Date: Sun, 9 Jul 2017 19:48:23 +0200 Subject: [PATCH 1/2] Fix memory leak in mainWindow_checkDate (Resolves #4) --- src/mainwindow.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mainwindow.c b/src/mainwindow.c index 5e18881..a25e4ea 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -859,14 +859,17 @@ void mainWindow_checkDate(GtkWidget *widget, gint event, gpointer user_data) { struct mainWindow *mainWindow = (struct mainWindow *)user_data; GDateTime *datetime; + gchar *temp; datetime = mdiary_get_date_from_string((char *)gtk_entry_get_text(GTK_ENTRY(widget))); if (!datetime) { datetime = g_date_time_new_from_unix_local(widget == mainWindow->dateStart ? mainWindow->filterSettings.time_start : mainWindow->filterSettings.time_end); + temp = g_date_time_format(datetime, "%Y-%m-%d"); gtk_entry_set_text(GTK_ENTRY(widget), - g_date_time_format(datetime, "%Y-%m-%d")); + temp); + g_free(temp); } g_date_time_unref(datetime); } From eeb9d87cc3bf40bcfe60f83fd688f25c4a8796d8 Mon Sep 17 00:00:00 2001 From: Markus Koch Date: Sun, 9 Jul 2017 19:56:01 +0200 Subject: [PATCH 2/2] Correct integer type used for times Some functions used guint instead of gint64. This commit corrects them all. --- src/mainwindow.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mainwindow.c b/src/mainwindow.c index a25e4ea..b30eb68 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -53,7 +53,7 @@ static gboolean mainWindow_list_entry_visible(GtkTreeModel *model, gboolean search_matched = 0; GDateTime *datetime; - guint time; + gint64 time; if (mainWindow->filterSettings.hide_all) return FALSE; @@ -126,8 +126,8 @@ static gint mainWindow_sort_date_compare_func(GtkTreeModel *model, { GDateTime *datetime1; GDateTime *datetime2; - guint time1; - guint time2; + gint64 time1; + gint64 time2; gtk_tree_model_get(model, a, COL_TIMESTAMP, &datetime1, -1); gtk_tree_model_get(model, b, COL_TIMESTAMP, &datetime2, -1);