Use PACKET_COUNT_IS_UNLIMITED() in pcap_offline_read().

That's what should always be used to check whether a packet count
argument means "give me all the packets you have".

Check it first, so we don't compare the packet count against a zero or
negative value.

(cherry picked from commit 56c60dd660297b5cf02afcb9fdc4f92689de0353)

diff --git a/savefile.c b/savefile.c
index 9e6a7deb6f891fece9ec955709efa3c1489ae92e..acd915cf73057912fe7a6dffc541fb6e94648529 100644 (file)
--- a/savefile.c
+++ b/savefile.c
@@ -663,7 +663,8 @@ pcap_offline_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
                if ((fcode = p->fcode.bf_insns) == NULL ||
                    pcap_filter(fcode, data, h.len, h.caplen)) {
                        (*callback)(user, &h, data);
-                       if (++n >= cnt && cnt > 0)
+                       n++;    /* count the packet */
+                       if (!PACKET_COUNT_IS_UNLIMITED(cnt) && n >= cnt)
                                break;
                }
        }