diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-03-24 05:27:03 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-03-24 05:27:03 +0000 |
| commit | e361585aef9a206092b755a9ed0b99ecec82e1b4 (patch) | |
| tree | 159435e1b0fbce0c749d63fc3573bd9c3b6ce902 | |
| parent | 8b33d8b19a34bfbaba96293d92225be932bc2bef (diff) | |
The "new" routine for STTYPE_STRING and STTYPE_UNPARSED does a
"strdup()" on the argument, so we don't need to do that ourselves (and,
in fact, as we're doing it ourselves but not freeing the result, we leak
memory).
svn path=/trunk/; revision=13892
| -rw-r--r-- | epan/dfilter/scanner.l | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/epan/dfilter/scanner.l b/epan/dfilter/scanner.l index 10d3f19b28..a621292699 100644 --- a/epan/dfilter/scanner.l +++ b/epan/dfilter/scanner.l @@ -186,11 +186,12 @@ GString* quoted_string = NULL; <DQUOTE>\" { /* end quote */ - char *my_string = g_strdup(quoted_string->str); + int token; BEGIN(INITIAL); + token = set_lval(TOKEN_STRING, quoted_string->str); g_string_free(quoted_string, TRUE); quoted_string = NULL; - return set_lval(TOKEN_STRING, my_string); + return token; } <DQUOTE>\\[0-7]{1,3} { @@ -228,7 +229,7 @@ GString* quoted_string = NULL; [-[:alnum:]_\.]+\/[[:digit:]]+ { /* CIDR */ - return set_lval(TOKEN_UNPARSED, g_strdup(yytext)); + return set_lval(TOKEN_UNPARSED, yytext); } [-\+[:alnum:]_.,:]+ { @@ -242,13 +243,13 @@ GString* quoted_string = NULL; } else { /* No, so treat it as an unparsed string */ - return set_lval(TOKEN_UNPARSED, g_strdup(yytext)); + return set_lval(TOKEN_UNPARSED, yytext); } } . { /* Default */ - return set_lval(TOKEN_UNPARSED, g_strdup(yytext)); + return set_lval(TOKEN_UNPARSED, yytext); } |