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

Don't set anything in *wth until we've decided it's a Peek classic file. 

Change-Id: I8b6f5b46cc578a65eec3e255d468d3841f9b0197
Reviewed-on: https://code.wireshark.org/review/30652
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-11-15 09:52:02 -08:00
parent 6c66a639d0
commit c82c60136d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wiretap/peekclassic.c
View File

@ -153,6 +153,7 @@ wtap_open_return_val peekclassic_open(wtap *wth, int *err, gchar **err_info)
{
peekclassic_header_t ep_hdr;
time_t reference_time;
int file_encap;
peekclassic_t *peekclassic;
/* Peek classic files do not start with a magic value large enough
@ -231,11 +232,11 @@ wtap_open_return_val peekclassic_open(wtap *wth, int *err, gchar **err_info)
switch (ep_hdr.secondary.v567.mediaType) {
case 0:
wth->file_encap = WTAP_ENCAP_ETHERNET;
file_encap = WTAP_ENCAP_ETHERNET;
break;
case 1:
wth->file_encap = WTAP_ENCAP_TOKEN_RING;
file_encap = WTAP_ENCAP_TOKEN_RING;
break;
default:
@ -255,7 +256,7 @@ wtap_open_return_val peekclassic_open(wtap *wth, int *err, gchar **err_info)
* some radio information. Presumably
* this is from AiroPeek.
*/
wth->file_encap = WTAP_ENCAP_IEEE_802_11_WITH_RADIO;
file_encap = WTAP_ENCAP_IEEE_802_11_WITH_RADIO;
break;
default:
@ -316,6 +317,7 @@ wtap_open_return_val peekclassic_open(wtap *wth, int *err, gchar **err_info)
peekclassic = (peekclassic_t *)g_malloc(sizeof(peekclassic_t));
wth->priv = (void *)peekclassic;
peekclassic->reference_time = reference_time;
wth->file_encap = file_encap;
switch (ep_hdr.master.version) {
case 5: