aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-agentx.c
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2010-11-03 20:44:46 +0000
committerJaap Keuter <jaap.keuter@xs4all.nl>2010-11-03 20:44:46 +0000
commitc093ff0bfce5ef8ade99e6fab8ef82d30ac4bcf2 (patch)
treedc1cebbce85c0bab924c84549df4233b5dc74cf9 /epan/dissectors/packet-agentx.c
parentf329864abfdd698c770769d99dcc1ed21f94b819 (diff)
From Fulko Hew:
According to RFC 2741 section 6.2.1 the Open-PDU can have an o.id field containing a 'null' identifier. The dissector currently does not handle it and causes other (misleading) error messages to appear on the decode window. svn path=/trunk/; revision=34765
Diffstat (limited to 'epan/dissectors/packet-agentx.c')
-rw-r--r--epan/dissectors/packet-agentx.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c
index 544d90c44f..51f68f50af 100644
--- a/epan/dissectors/packet-agentx.c
+++ b/epan/dissectors/packet-agentx.c
@@ -356,8 +356,7 @@ static int dissect_object_id(tvbuff_t *tvb, proto_tree *tree, int offset, char f
}
if(!(slen = convert_oid_to_str(&oid[0], n_subid, &str_oid[0], 2048, prefix)))
- return offset;
-
+ slen = g_snprintf(&str_oid[0], 2048, "(null)");
if(tree) {
item = proto_tree_add_text(tree,tvb,offset,n_subid + 4 ,