osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Peter Hawkins: fix the maximum length argument to "tvb_memcpy()". 

svn path=/trunk/; revision=5664
This commit is contained in:
Guy Harris 2002-06-13 07:32:34 +00:00
parent 1fdab024c0
commit be4fc3120a
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AUTHORS
View File

@ -1252,6 +1252,10 @@ Steve Housley <Steve_Housley[AT]eur.3com.com> {
802.3ad LACP support
}
Peter Hawkins <peter[AT]hawkins.emu.id.au> {
Various bounds-check fixes
}
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.

1
doc/ethereal.pod.template
View File

@ -1448,6 +1448,7 @@ B<http://www.ethereal.com>.
John Wells <wells[AT]ieee.org>
Loic Tortay <tortay[AT]cc.in2p3.fr>
Steve Housley <Steve_Housley[AT]eur.3com.com>
Peter Hawkins <peter[AT]hawkins.emu.id.au>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
permission to use his version of snprintf.c.

8
packet-beep.c
View File

@ -1,7 +1,7 @@
/* packet-beep.c
* Routines for BEEP packet disassembly
*
* $Id: packet-beep.c,v 1.8 2002/04/29 09:40:05 guy Exp $
* $Id: packet-beep.c,v 1.9 2002/06/13 07:32:32 guy Exp $
*
* Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
* Modified 2001 Darren New <dnew@invisible.net> for BEEP.
@ -470,9 +470,11 @@ dissect_beep_int(tvbuff_t *tvb, int offset,
memset(int_buff, '\0', sizeof(int_buff));
tvb_memcpy(tvb, int_buff, offset, MIN(sizeof(int_buff), i));
tvb_memcpy(tvb, int_buff, offset, MIN(sizeof(int_buff) - 1, i));
sscanf(int_buff, "%d", &ival); /* FIXME: Dangerous */
/* XXX - is this still "Dangerous" now that we don't copy to the
last byte of "int_buff[]"? */
sscanf(int_buff, "%d", &ival);
if (tree) {
proto_tree_add_uint(tree, hf, tvb, offset, i, ival);