diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2013-06-20 18:54:58 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2013-06-20 18:54:58 +0000 |
| commit | 64e15853fc2665894c42d690fdc3595348612a82 (patch) | |
| tree | 0feab5fa3c2b33ce7f5fd9d9d118781f81eab730 /asn1 | |
| parent | dc82f1cc93162490c0c2fbf7a6e884d9fe6eede1 (diff) | |
Fix for bug 8826.
The global variable 'address_item' was not always being set to NULL
before the dissection of a new frame. Do more to set it in the general
case, and in the particular case of an MTSBindResult_PDU, which was
triggering an error in the supplied capture.
There may be other entry points where this still safely isn't being
set.
svn path=/trunk/; revision=50083
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/p1/p1.cnf | 3 | ||||
| -rw-r--r-- | asn1/p1/packet-p1-template.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/asn1/p1/p1.cnf b/asn1/p1/p1.cnf index 7d8f4c3f34..99a02a66f8 100644 --- a/asn1/p1/p1.cnf +++ b/asn1/p1/p1.cnf @@ -1304,5 +1304,8 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" %(DEFAULT_BODY)s p1_initialize_content_globals(NULL, FALSE); +#.FN_HDR MTSBindResult + /* TODO: there may be other entry points where this global should be initialized... */ + address_item = NULL; #.END diff --git a/asn1/p1/packet-p1-template.c b/asn1/p1/packet-p1-template.c index 0c47d17b8a..6335ae450e 100644 --- a/asn1/p1/packet-p1-template.c +++ b/asn1/p1/packet-p1-template.c @@ -123,6 +123,7 @@ void p1_initialize_content_globals (proto_tree *tree, gboolean report_unknown_co top_tree = tree; content_type_id = NULL; report_unknown_content_type = report_unknown_cont_type; + address_item = NULL; } char* p1_get_last_oraddress (void) |