From 60cb992cac797abdbbb7a17b985e0a2af9887ded Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Sun, 12 Jun 2016 00:58:43 +0200 Subject: [PATCH] Fix double free --- source/helper.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/helper.c b/source/helper.c index fdabb64e..f257ab6c 100644 --- a/source/helper.c +++ b/source/helper.c @@ -162,7 +162,9 @@ void tokenize_free ( char ** tokens ) } else if ( config.regex ) { for ( size_t i = 0; tokens && tokens[i]; i++ ) { - g_regex_unref ( (GRegex *) tokens[i] ); + if ( tokens[i] != NULL ) { + g_regex_unref ( (GRegex *) tokens[i] ); + } } g_free ( tokens ); } @@ -193,7 +195,6 @@ char **tokenize ( const char *input, int case_sensitive ) gchar *r = g_regex_escape_string ( input, -1 ); reg = g_regex_new ( r, ( case_sensitive ) ? 0 : G_REGEX_CASELESS, G_REGEX_MATCH_PARTIAL, NULL ); g_free ( r ); - g_free ( retv ); } retv[0] = (char *) reg; }