osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Throw a BoundsError if a length parameter in a tvbuff-accessor is < -1. 

svn path=/trunk/; revision=4474
This commit is contained in:
Gilbert Ramirez 2002-01-04 06:45:14 +00:00
parent 9588f37fac
commit a2251afaff
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/tvbuff.c
View File

@ -9,7 +9,7 @@
* the data of a backing tvbuff, or can be a composite of
* other tvbuffs.
*
* $Id: tvbuff.c,v 1.26 2001/11/20 22:46:12 guy Exp $
* $Id: tvbuff.c,v 1.27 2002/01/04 06:45:14 gram Exp $
*
* Copyright (c) 2000 by Gilbert Ramirez <gram@alumni.rice.edu>
*
@ -407,8 +407,10 @@ compute_offset_length(tvbuff_t *tvb, gint offset, gint length,
}
/* Compute the length */
g_assert(length >= -1);
if (length == -1) {
if (length < -1) {
return FALSE;
}
else if (length == -1) {
*length_ptr = tvb->length - *offset_ptr;
}
else {
@ -457,6 +459,10 @@ check_offset_length(tvbuff_t *tvb, gint offset, gint length,
{
int exception = 0;
if (length < -1) {
THROW(BoundsError);
}
if (!check_offset_length_no_exception(tvb, offset, length, offset_ptr, length_ptr, &exception)) {
g_assert(exception > 0);
THROW(exception);