Hmmm. Second try to fix the const problems.

svn path=/trunk/; revision=24238

3 files changed, 13 insertions, 5 deletions

diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c
index 23d136cf6f..895ae0411c 100644
--- a/epan/dfilter/dfilter.c
+++ b/epan/dfilter/dfilter.c
@@ -220,7 +220,7 @@ dfilter_compile(const gchar *text, dfilter_t **dfp)
 	dfilter_t	*dfilter;
 	dfwork_t	*dfw;
 	gboolean failure = FALSE;
-	char		*depr_test;
+	const char	*depr_test;
 	guint		i;
 	GPtrArray	*deprecated = g_ptr_array_new();
 
@@ -262,7 +262,7 @@ dfilter_compile(const gchar *text, dfilter_t **dfp)
 		}
 
 		if (depr_test) {
-			g_ptr_array_add(deprecated, depr_test);
+			g_ptr_array_add(deprecated, g_strdup(depr_test));
 		}
 
 		/* Give the token to the parser */
@@ -306,6 +306,10 @@ dfilter_compile(const gchar *text, dfilter_t **dfp)
 	 * it and set *dfp to NULL */
 	if (dfw->st_root == NULL) {
 		*dfp = NULL;
+		for (i = 0; i < deprecated->len; ++i) {
+			gchar* depr = g_ptr_array_index(deprecated,i);
+			g_free(depr);
+		}
 		g_ptr_array_free(deprecated, TRUE);
 	}
 	else {
@@ -350,6 +354,10 @@ FAILURE:
 	if (dfw) {
 		dfwork_free(dfw);
 	}
+	for (i = 0; i < deprecated->len; ++i) {
+		gchar* depr = g_ptr_array_index(deprecated,i);
+		g_free(depr);
+	}
 	g_ptr_array_free(deprecated, TRUE);
 	dfilter_fail("Unable to parse filter string \"%s\".", text);
 	*dfp = NULL;
diff --git a/epan/dfilter/syntax-tree.c b/epan/dfilter/syntax-tree.c
index 5a2cd920a2..43ea095899 100644
--- a/epan/dfilter/syntax-tree.c
+++ b/epan/dfilter/syntax-tree.c
@@ -190,7 +190,7 @@ stnode_value(stnode_t *node)
 	return node->value;
 }
 
-char *
+const char *
 stnode_deprecated(stnode_t *node)
 {
 	if (!node) {
diff --git a/epan/dfilter/syntax-tree.h b/epan/dfilter/syntax-tree.h
index aa75860688..27f0aec58e 100644
--- a/epan/dfilter/syntax-tree.h
+++ b/epan/dfilter/syntax-tree.h
@@ -60,7 +60,7 @@ typedef struct {
 	 * set aside to time to do so. */
 	gpointer	data;
 	gint32		value;
-        char            *deprecated_token;
+        const char      *deprecated_token;
 } stnode_t;
 
 /* These are the sttype_t registration function prototypes. */
@@ -104,7 +104,7 @@ stnode_data(stnode_t *node);
 gint32
 stnode_value(stnode_t *node);
 
-char *
+const char *
 stnode_deprecated(stnode_t *node);
 
 #define assert_magic(obj, mnum) \