Changeset 1490 for trunk/lib/format_pcapfile.c

Timestamp:

01/19/10 15:35:02 (3 years ago)

Author:

salcock

Message:

• Fixed bug where a packet with zero bytes of payload would result in pcapfile_read_packet returning an EOF indicator.

File:

• trunk/lib/format_pcapfile.c (modified) (3 diffs)

trunk/lib/format_pcapfile.c

@@ -279 +279 @@
         int err;
         uint32_t flags = 0;
-        
+        size_t bytes_to_read = 0;
+
         assert(libtrace->format_data);
 
@@ -303 +304 @@
                 return 0;
         }
-        
-        assert(swapl(libtrace,((libtrace_pcapfile_pkt_hdr_t*)packet->buffer)->caplen)<LIBTRACE_PACKET_BUFSIZE);
-
+
+        bytes_to_read = swapl(libtrace,((libtrace_pcapfile_pkt_hdr_t*)packet->buffer)->caplen);
+
+        assert(bytes_to_read < LIBTRACE_PACKET_BUFSIZE);
+
+        /* If there is no payload to read, do not ask wandio_read to try and
+         * read zero bytes - we'll just get back a zero that we will 
+         * misinterpret as EOF! */
+        if (bytes_to_read == 0) {
+                return sizeof(libtrace_pcapfile_pkt_hdr_t);
+        }
 
         err=wandio_read(libtrace->io,
@@ -326 +335 @@
         }
         
-        return sizeof(libtrace_pcapfile_pkt_hdr_t)
-                +swapl(libtrace,((libtrace_pcapfile_pkt_hdr_t*)packet->buffer)->caplen);
+        return sizeof(libtrace_pcapfile_pkt_hdr_t) + bytes_to_read;
 }