diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-20 12:09:25 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-20 12:09:25 +0000 |
| commit | afe5b2fe9dae76b4d8ede5172b803fcc935b1589 (patch) | |
| tree | 24d6d6c0fc74cca3a438c364d320adbecd8b12a9 /epan/column-utils.c | |
| parent | 1a61b42e8a5517c4eaffb1b9b1072a7eb9adce72 (diff) | |
Use ep_verify_pointer() in col_set_str() to verify that the caller hasn't passed us something from the ephemeral pool
svn path=/trunk/; revision=30012
Diffstat (limited to 'epan/column-utils.c')
| -rw-r--r-- | epan/column-utils.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/epan/column-utils.c b/epan/column-utils.c index 4e607aa08d..cc3d81816b 100644 --- a/epan/column-utils.c +++ b/epan/column-utils.c @@ -209,6 +209,10 @@ col_set_str(column_info *cinfo, gint el, const gchar* str) DISSECTOR_ASSERT(str); + /* The caller is expected to pass in something that 'will stay around' and + * something from the ephemeral pool certainly doesn't fit the bill. */ + DISSECTOR_ASSERT(!ep_verify_pointer(str)); + if (!CHECK_COL(cinfo, el)) return; @@ -602,6 +606,7 @@ col_append_sep_str(column_info *cinfo, gint el, const gchar* separator, if (separator == NULL) separator = ", "; /* default */ + col_do_append_str(cinfo, el, separator, str); } |