diff options
| author | Gerald Combs <gerald@wireshark.org> | 2005-01-14 17:09:11 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2005-01-14 17:09:11 +0000 |
| commit | 6c530b42b33566c4ec156c8c23c67ed454f29fc8 (patch) | |
| tree | 95d23575438891d0f07573397f7148518616b563 /epan/dissectors/packet-ncp-nmas.c | |
| parent | fbbfb4aeadab2517b51947d0b1caee38ba6d1802 (diff) | |
| download | wireshark-6c530b42b33566c4ec156c8c23c67ed454f29fc8.tar.gz wireshark-6c530b42b33566c4ec156c8c23c67ed454f29fc8.tar.bz2 wireshark-6c530b42b33566c4ec156c8c23c67ed454f29fc8.zip | |
From Greg Morris: Improve malformed packet handling.
svn path=/trunk/; revision=13034
Diffstat (limited to 'epan/dissectors/packet-ncp-nmas.c')
| -rw-r--r-- | epan/dissectors/packet-ncp-nmas.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c index 1f8b8b3a40..f5d6776deb 100644 --- a/epan/dissectors/packet-ncp-nmas.c +++ b/epan/dissectors/packet-ncp-nmas.c @@ -504,6 +504,8 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin foffset += 4; break; case 2: + proto_tree_add_text(atree, tvb, foffset, -1, "Verb: %s", + val_to_str(subverb, nmas_subverb_enum, "Unknown (%u)")); proto_tree_add_item(atree, hf_length, tvb, foffset, 4, TRUE); msg_length = tvb_get_letohl(tvb, foffset); foffset +=4; @@ -513,9 +515,7 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin roffset = foffset; foffset += 4; msg_length -= 8; - proto_tree_add_text(atree, tvb, foffset, -1, "Verb: %s", - val_to_str(subverb, nmas_subverb_enum, "Unknown (%u)")); - if (return_code == 0) + if (return_code == 0 && msg_length > 0) { switch (subverb) { case 0: /* Fragmented Ping */ |