diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-21 11:31:21 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-21 11:31:21 +0000 |
| commit | 2afdee256c251619ed4cc9778463888d8fc70569 (patch) | |
| tree | 63f53f21d045e9a4f648e833c02a8ce454fe2526 /epan/dfilter/dfilter.c | |
| parent | 27f7d88c840a704b1b41324ace2e0fd3c2806857 (diff) | |
| download | wireshark-2afdee256c251619ed4cc9778463888d8fc70569.tar.gz | |
Handle a text NULL pointer more gracefully
svn path=/trunk/; revision=29491
Diffstat (limited to 'epan/dfilter/dfilter.c')
| -rw-r--r-- | epan/dfilter/dfilter.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/epan/dfilter/dfilter.c b/epan/dfilter/dfilter.c index b7b7da4d3f..2ca09112b3 100644 --- a/epan/dfilter/dfilter.c +++ b/epan/dfilter/dfilter.c @@ -211,7 +211,14 @@ dfilter_compile(const gchar *text, dfilter_t **dfp) gboolean failure = FALSE; const char *depr_test; guint i; - GPtrArray *deprecated = g_ptr_array_new(); + GPtrArray *deprecated; + + g_assert(dfp); + + if (!text) { + *dfp = NULL; + return FALSE; + } dfilter_error_msg = NULL; @@ -223,6 +230,8 @@ dfilter_compile(const gchar *text, dfilter_t **dfp) df_scanner_text(text); + deprecated = g_ptr_array_new(); + while (1) { df_lval = stnode_new(STTYPE_UNINITIALIZED, NULL); token = df_lex(); |