aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-mount.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2006-07-07 04:01:09 +0000
committerGerald Combs <gerald@wireshark.org>2006-07-07 04:01:09 +0000
commitbbc5a76517c8632a24ccc05acdc98002554c7c2c (patch)
tree43bea1c5b08d75a8140b00ef0a217633c3197e31 /epan/dissectors/packet-mount.c
parent7976c442db7d58ee9be01679597952074f5c5b46 (diff)
Fix more bugs found by Ilja van Sprundel.
packet-mount.c: Don't allocate a huge amount of memory. packet-ntp.c: Fix a possible format string bug. packet-ndps.c: packet-nmas.c: Fix an off-by-one buffer error. svn path=/trunk/; revision=18678
Diffstat (limited to 'epan/dissectors/packet-mount.c')
-rw-r--r--epan/dissectors/packet-mount.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c
index a07fdad579..15c350a130 100644
--- a/epan/dissectors/packet-mount.c
+++ b/epan/dissectors/packet-mount.c
@@ -172,6 +172,7 @@ dissect_mount_dirpath_call(tvbuff_t *tvb, int offset, packet_info *pinfo,
host=ip_to_str(pinfo->dst.data);
len=tvb_get_ntohl(tvb, offset);
+ DISSECTOR_ASSERT(len < ITEM_LABEL_LENGTH);
dir=tvb_get_ptr(tvb, offset+4, len);
if(dir){
@@ -855,11 +856,11 @@ static const value_string mount3_proc_vals[] = {
static const vsff sgi_mount1_proc[] = {
{ 0, "NULL", NULL, NULL },
- { MOUNTPROC_MNT, "MNT",
+ { MOUNTPROC_MNT, "MNT",
dissect_mount_dirpath_call, dissect_mount1_mnt_reply },
{ MOUNTPROC_DUMP, "DUMP",
NULL, dissect_mount_dump_reply },
- { MOUNTPROC_UMNT, "UMNT",
+ { MOUNTPROC_UMNT, "UMNT",
dissect_mount_dirpath_call, NULL },
{ MOUNTPROC_UMNTALL, "UMNTALL",
NULL, NULL },