diff options
author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-04-17 10:09:52 +0000 |
---|---|---|
committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-04-17 10:09:52 +0000 |
commit | 0baae73dd8888b72f0306963bb32cb1162ebcf65 (patch) | |
tree | ef92da622d8862e08d9b2e8c700a29123d28c412 /wiretap | |
parent | 5d69d5145a363170b3ff6b19976f7f49a9a56a02 (diff) |
From Jakub Zawadzki:
Fix compile without zlib.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32501 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap')
-rw-r--r-- | wiretap/packetlogger.c | 4 | ||||
-rw-r--r-- | 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; } |