From f861d72bb2bc4f933147e1c53b8afe571f90f320 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 14 Oct 2002 22:18:16 +0000 Subject: [PATCH] Fix a memory leak. (#94550, Sebastian Rittau) Mon Oct 14 15:51:05 2002 Owen Taylor * glib/gdate.c (g_date_fill_parse_tokens): Fix a memory leak. (#94550, Sebastian Rittau) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gdate.c | 8 +++++--- 8 files changed, 40 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index af7d6a2..7eadedb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 14 15:51:05 2002 Owen Taylor + + * glib/gdate.c (g_date_fill_parse_tokens): Fix a memory + leak. (#94550, Sebastian Rittau) + Mon Oct 14 15:36:11 2002 Owen Taylor * glib/gcompletion.[ch] (g_completion_complete): Make diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index af7d6a2..7eadedb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Oct 14 15:51:05 2002 Owen Taylor + + * glib/gdate.c (g_date_fill_parse_tokens): Fix a memory + leak. (#94550, Sebastian Rittau) + Mon Oct 14 15:36:11 2002 Owen Taylor * glib/gcompletion.[ch] (g_completion_complete): Make diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index af7d6a2..7eadedb 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Mon Oct 14 15:51:05 2002 Owen Taylor + + * glib/gdate.c (g_date_fill_parse_tokens): Fix a memory + leak. (#94550, Sebastian Rittau) + Mon Oct 14 15:36:11 2002 Owen Taylor * glib/gcompletion.[ch] (g_completion_complete): Make diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index af7d6a2..7eadedb 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Mon Oct 14 15:51:05 2002 Owen Taylor + + * glib/gdate.c (g_date_fill_parse_tokens): Fix a memory + leak. (#94550, Sebastian Rittau) + Mon Oct 14 15:36:11 2002 Owen Taylor * glib/gcompletion.[ch] (g_completion_complete): Make diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index af7d6a2..7eadedb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Oct 14 15:51:05 2002 Owen Taylor + + * glib/gdate.c (g_date_fill_parse_tokens): Fix a memory + leak. (#94550, Sebastian Rittau) + Mon Oct 14 15:36:11 2002 Owen Taylor * glib/gcompletion.[ch] (g_completion_complete): Make diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index af7d6a2..7eadedb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Oct 14 15:51:05 2002 Owen Taylor + + * glib/gdate.c (g_date_fill_parse_tokens): Fix a memory + leak. (#94550, Sebastian Rittau) + Mon Oct 14 15:36:11 2002 Owen Taylor * glib/gcompletion.[ch] (g_completion_complete): Make diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index af7d6a2..7eadedb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Oct 14 15:51:05 2002 Owen Taylor + + * glib/gdate.c (g_date_fill_parse_tokens): Fix a memory + leak. (#94550, Sebastian Rittau) + Mon Oct 14 15:36:11 2002 Owen Taylor * glib/gcompletion.[ch] (g_completion_complete): Make diff --git a/glib/gdate.c b/glib/gdate.c index 72bf21b..bfbb714 100644 --- a/glib/gdate.c +++ b/glib/gdate.c @@ -528,7 +528,7 @@ g_date_fill_parse_tokens (const gchar *str, GDateParseTokens *pt) if (found != NULL) { pt->month = i; - return; + break; } } @@ -539,12 +539,14 @@ g_date_fill_parse_tokens (const gchar *str, GDateParseTokens *pt) if (found != NULL) { pt->month = i; - return; + break; } } ++i; - } + } + + g_free (normalized); } } -- 2.7.4