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

Add an arbitrary limit on the maximum size of the frame table, so that 

we don't crash.  Fixes bug 6669.

svn path=/trunk/; revision=40168
This commit is contained in:
Guy Harris 2011-12-13 01:49:27 +00:00
parent c8182253c8
commit 89303e99c4
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wiretap/netmon.c
View File

@ -338,6 +338,19 @@ int netmon_open(wtap *wth, int *err, gchar **err_info)
g_free(netmon);
return -1;
}
/*
* XXX - clamp the size of the frame table, so that we don't
* attempt to allocate a huge frame table and fail.
* We shouldn't do this on 64-bit systems.
* We pick 64 megabytes as an arbitrary limit.
*/
if (frame_table_size > 16*1024*1024) {
*err = WTAP_ERR_UNSUPPORTED;
*err_info = g_strdup_printf("netmon: frame table length is %u, which is larger than we support",
frame_table_length);
g_free(netmon);
return -1;
}
if (file_seek(wth->fh, frame_table_offset, SEEK_SET, err) == -1) {
g_free(netmon);
return -1;