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

From Graeme Hewson: 

Fix assertion failure when absolute value of negative slice
     offset > field length.

     Remove code for handling negative slice lengths.

svn path=/trunk/; revision=11084
This commit is contained in:
Guy Harris 2004-06-03 07:34:49 +00:00
parent 53cb6eeb54
commit e6e3ff60f5
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
epan/ftypes/ftypes.c
View File

@ -1,5 +1,5 @@
/*
* $Id: ftypes.c,v 1.22 2004/05/09 08:29:48 guy Exp $
* $Id: ftypes.c,v 1.23 2004/06/03 07:34:49 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -344,6 +344,10 @@ slice_func(gpointer data, gpointer user_data)
/* Check for negative start */
if (start_offset < 0) {
start_offset = field_length + start_offset;
if (start_offset < 0) {
slice_data->slice_failure = TRUE;
return;
}
}
/* Check the end type, and set both end_offset and length */
@ -354,43 +358,27 @@ slice_func(gpointer data, gpointer user_data)
}
else if (ending == LENGTH) {
length = drange_node_get_length(drnode);
if (length < 0) {
end_offset = field_length + length;
if (end_offset >= start_offset) {
length = end_offset - start_offset + 1;
}
else {
slice_data->slice_failure = TRUE;
return;
}
}
else {
end_offset = start_offset + length - 1;
}
end_offset = start_offset + length - 1;
}
else if (ending == OFFSET) {
end_offset = drange_node_get_end_offset(drnode);
if (end_offset < 0) {
end_offset = field_length + end_offset;
if (end_offset >= start_offset) {
length = end_offset - start_offset + 1;
if (end_offset < 0) {
slice_data->slice_failure = TRUE;
return;
}
else {
if (end_offset < start_offset) {
slice_data->slice_failure = TRUE;
return;
}
}
else {
length = end_offset - start_offset + 1;
}
length = end_offset - start_offset + 1;
}
else {
g_assert_not_reached();
}
/* g_debug("(NEW) start_offset=%d length=%d end_offset=%d",
start_offset, length, end_offset); */
if (end_offset >= (int) field_length) {
slice_data->slice_failure = TRUE;
return;