diff options
| author | Anthony Coddington <anthony.coddington@endace.com> | 2018-01-22 17:38:44 +1300 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2018-01-22 09:44:09 +0000 |
| commit | 3e14d3b440eb85fce8e48d5d0326c60dff7fe10a (patch) | |
| tree | bf60c688444935c808125537ee1ae3174bc74268 | |
| parent | 6358aadfd62ffe24e3b8ba5b8b6b6ac50d633f80 (diff) | |
ERF: Fix broken erf_open ethernet checking
Was copying 8 byte extension header instead of 2 byte ethernet padding subheader.
Introduced recently by I8ede5c733867ccc98ab2d470181d1e4a29ae5b49.
Change-Id: I95a8604ed6204dff33f1794601342e090f6b7eb3
Reviewed-on: https://code.wireshark.org/review/25410
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
| -rw-r--r-- | wiretap/erf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/erf.c b/wiretap/erf.c index 9955d68aa1..91b7a892ff 100644 --- a/wiretap/erf.c +++ b/wiretap/erf.c @@ -522,16 +522,16 @@ extern wtap_open_return_val erf_open(wtap *wth, int *err, gchar **err_info) case ERF_TYPE_COLOR_ETH: case ERF_TYPE_DSM_COLOR_ETH: case ERF_TYPE_COLOR_HASH_ETH: - if (!wtap_read_bytes(wth->fh,ð_hdr,erf_ext_header_size,err,err_info)) { + if (!wtap_read_bytes(wth->fh,ð_hdr,erf_eth_hdr_size,err,err_info)) { if (*err == WTAP_ERR_SHORT_READ) { /* Subheader missing, not an ERF file */ return WTAP_OPEN_NOT_MINE; } return WTAP_OPEN_ERROR; } - if (packet_size < erf_ext_header_size) + if (packet_size < erf_eth_hdr_size) return WTAP_OPEN_NOT_MINE; - packet_size -= erf_ext_header_size; + packet_size -= erf_eth_hdr_size; break; default: break; |