diff options
| author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-02-16 11:47:16 +0000 |
|---|---|---|
| committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-02-16 11:47:16 +0000 |
| commit | 13da875d30d8fc25fd2b23bedbda32e1d11a66f1 (patch) | |
| tree | 7b24c0a6c947f1623ec018cdf19ab25f624a3470 /epan/dissectors/packet-x509af.c | |
| parent | f2952766267f6284999eb50bd35f2de892913c7e (diff) | |
Paolo Abeni:
The attached patch should fix bug 742.
The issue is (at least, I think so...) in the packet-x509af dissector
A null pointer is passes as parameter of a " %s " format string.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17317 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-x509af.c')
| -rw-r--r-- | epan/dissectors/packet-x509af.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index 022c8f97a9..56a6d55a19 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -427,12 +427,14 @@ static int dissect_x509af_SubjectName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { #line 112 "x509af.cnf" + const char* str; offset = dissect_ber_choice(pinfo, tree, tvb, offset, SubjectName_choice, hf_index, ett_x509af_SubjectName, NULL); - proto_item_append_text(proto_item_get_parent(tree), " (%s)", x509if_get_last_dn()); + str = x509if_get_last_dn(); + proto_item_append_text(proto_item_get_parent(tree), " (%s)", str?str:""); @@ -1419,7 +1421,7 @@ void proto_register_x509af(void) { "AttributeCertificateAssertion/attType", HFILL }}, { &hf_x509af_attType_item, { "Item", "x509af.attType_item", - FT_STRING, BASE_NONE, NULL, 0, + FT_OID, BASE_NONE, NULL, 0, "AttributeCertificateAssertion/attType/_item", HFILL }}, { &hf_x509af_p, { "p", "x509af.p", |