diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-11-04 08:54:45 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2006-11-04 08:54:45 +0000 |
| commit | 350cd176c21f9a4a23ed0ea0245d5ca227bedf2a (patch) | |
| tree | 50a0eeb254f4ed0b3cd72240babee21b99547e28 /epan | |
| parent | a213330a6184a5b39b798a93723dfc2c01c00c70 (diff) | |
From SF
Attached is a fix for bug #1156: "If a dissector depends on a new
datasource created by a new tvb, that dissector's protocol can't be
filtered on."
Thanks,
Steve
I change the code slightly to avoid dereferenceing a NULL pointer.
While the original code was fine and safe on unix dereferencing a null pointer in this way would be unsafe and cause a segmentation violation on windows if tree is NULL.
svn path=/trunk/; revision=19791
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 9fc9db7f7d..8224071e3a 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -1148,7 +1148,7 @@ dissect_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, ssl_print_text_data("decrypted app data",pi->app_data.data, pi->app_data.data_len); - call_dissector(association->handle, new_tvb, pinfo, proto_tree_get_root(tree)); + call_dissector(association->handle, new_tvb, pinfo, tree?tree->parent:NULL); } } break; |