From 51af731c3acb779b88fbb32f4b4772b51a8a52af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Sat, 17 Apr 2010 10:09:52 +0000 Subject: [PATCH] From Jakub Zawadzki: Fix compile without zlib. svn path=/trunk/; revision=32501 --- wiretap/packetlogger.c | 4 +++- wiretap/vms.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/wiretap/packetlogger.c b/wiretap/packetlogger.c index 6907009198..021ed129ef 100644 --- a/wiretap/packetlogger.c +++ b/wiretap/packetlogger.c @@ -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) && diff --git a/wiretap/vms.c b/wiretap/vms.c index 2259948de6..d24d1310f4 100644 --- a/wiretap/vms.c +++ b/wiretap/vms.c @@ -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; }