summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Davenport <qball@gmpclient.org>2016-06-12 00:58:43 +0200
committerDave Davenport <qball@gmpclient.org>2016-06-12 00:58:43 +0200
commit60cb992cac797abdbbb7a17b985e0a2af9887ded (patch)
treebc4ff3e5baacae6f3d4ff449ddb0e58d92bf2bf4
parente966fbe58369498eea87c9a634a170316c3e8f7d (diff)
Fix double free
-rw-r--r--source/helper.c5
1 files 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;
}