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

From Jakub Zawadzki: 

Fix compile without zlib.

svn path=/trunk/; revision=32501
This commit is contained in:
Stig Bjørlykke 2010-04-17 10:09:52 +00:00
parent e76dd3ebdb
commit 51af731c3a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wiretap/packetlogger.c
View File

@ -67,7 +67,9 @@ int packetlogger_open(wtap *wth, int *err, gchar **err_info _U_)
if(!packetlogger_read_header(&pl_hdr, wth->fh, err))
return -1;
file_read(&type, 1, 1, wth->fh);
if (file_read(&type, 1, 1, wth->fh) <= 0)
return -1;
/* Verify this file belongs to us */
if (!((8 <= pl_hdr.len) && (pl_hdr.len < 65536) &&

3
wiretap/vms.c
View File

@ -489,7 +489,8 @@ parse_vms_hex_dump(FILE_T fh, int pkt_len, guint8* buf, int *err,
}
/* Avoid TCPIPTRACE-W-BUFFERSFUL, TCPIPtrace could not save n packets.
* errors. */
file_gets(line, VMS_LINE_LENGTH, fh);
if (!file_gets(line, VMS_LINE_LENGTH, fh))
return FALSE;
return TRUE;
}