Wireshark-commits: [Wireshark-commits] master-1.10 bfd4ba9: Reject pcap files that claim on-the-wir
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=bfd4ba95c8365e1e92774e0398215e6b8cca7f66
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark
Commits:
bfd4ba9 by Evan Huus (eapache@xxxxxxxxx):
Reject pcap files that claim on-the-wire packet sizes > 64MB. This fixes many
heuristic cases broken in r49999 when we permitted packets > 64KB, since that
relaxed so severely the definition of a valid packet header.
64MB is an arbitrary and perhaps suboptimal number, but it seems to do the right
thing in all the examples I have handy.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9634
svn path=/trunk/; revision=54812
(cherry picked from commit dae86605b61bbbabd54749e6bde7c0c10b031ca8 with
release note updates)
Change-Id: Id3a9b413113148c8072bdd6c221246a56d0df2cb
Reviewed-on: https://code.wireshark.org/review/349
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Actions performed:
from 246ef6a If Gtk >= 3.10, allow use of deprecated Gtk features (and prevent 'deprecated' warnings);
adds bfd4ba9 Reject pcap files that claim on-the-wire packet sizes > 64MB. This fixes many heuristic cases broken in r49999 when we permitted packets > 64KB, since that relaxed so severely the definition of a valid packet header.
Summary of changes:
docbook/release-notes.asciidoc | 7 ++++---
wiretap/libpcap.c | 29 +++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 3 deletions(-)
