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

libpcap: set wth->priv to the libpcap_t before returning errors. 

That ensures that it'll be freed on an error, fixing Coverity CID
1497311.
This commit is contained in:
Guy Harris 2022-01-16 11:25:48 -08:00
parent 019f8aa26e
commit c8c7479ace
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wiretap/libpcap.c
View File

@ -236,7 +236,12 @@ wtap_open_return_val libpcap_open(wtap *wth, int *err, gchar **err_info)
}
/* This is a libpcap file */
libpcap = g_new(libpcap_t, 1);
wth->subtype_read = libpcap_read;
wth->subtype_seek_read = libpcap_seek_read;
wth->subtype_close = libpcap_close;
wth->snapshot_length = hdr.snaplen;
libpcap = g_new0(libpcap_t, 1);
wth->priv = (void *)libpcap;
/*
* Fill in the information we already know or can determine
* at this point, so the private data is usable by the code
@ -400,11 +405,6 @@ wtap_open_return_val libpcap_open(wtap *wth, int *err, gchar **err_info)
return WTAP_OPEN_ERROR;
}
libpcap->encap_priv = NULL;
wth->priv = (void *)libpcap;
wth->subtype_read = libpcap_read;
wth->subtype_seek_read = libpcap_seek_read;
wth->subtype_close = libpcap_close;
wth->snapshot_length = hdr.snaplen;
/*
* If this file has the standard magic number, it could be