Merge branch 'master' into breakloop_poll

[libpcap] / pcap.c

diff --git a/pcap.c b/pcap.c
index 480e6f3bcd9ad2274c09cc80ae6a4eb154b1f583..394a5e40743d51394fe3fa7f4c34e75e5aebaaf9 100644 (file)
--- a/pcap.c
+++ b/pcap.c
@@ -62,11 +62,7 @@ struct rtentry;              /* declarations in <net/if.h> */
 #endif
 #include <fcntl.h>
 #include <errno.h>
-#ifdef HAVE_LIMITS_H
 #include <limits.h>
-#else
-#define INT_MAX                2147483647
-#endif
 
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
@@ -3659,6 +3655,12 @@ pcap_cleanup_live_common(pcap_t *p)
 int
 pcap_sendpacket(pcap_t *p, const u_char *buf, int size)
 {
+       if (size <= 0) {
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "The number of bytes to be sent must be positive");
+               return (PCAP_ERROR);
+       }
+
        if (p->inject_op(p, buf, size) == -1)
                return (-1);
        return (0);
@@ -3671,7 +3673,23 @@ pcap_sendpacket(pcap_t *p, const u_char *buf, int size)
 int
 pcap_inject(pcap_t *p, const void *buf, size_t size)
 {
-       return (p->inject_op(p, buf, size));
+       /*
+        * We return the number of bytes written, so the number of
+        * bytes to write must fit in an int.
+        */
+       if (size > INT_MAX) {
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "More than %d bytes cannot be injected", INT_MAX);
+               return (PCAP_ERROR);
+       }
+
+       if (size == 0) {
+               pcap_fmt_errmsg_for_errno(p->errbuf, PCAP_ERRBUF_SIZE,
+                   errno, "The number of bytes to be injected must not be zero", INT_MAX);
+               return (PCAP_ERROR);
+       }
+
+       return (p->inject_op(p, buf, (int)size));
 }
 
 void
@@ -3696,7 +3714,7 @@ pcap_offline_filter(const struct bpf_program *fp, const struct pcap_pkthdr *h,
        const struct bpf_insn *fcode = fp->bf_insns;
 
        if (fcode != NULL)
-               return (bpf_filter(fcode, pkt, h->len, h->caplen));
+               return (pcap_filter(fcode, pkt, h->len, h->caplen));
        else
                return (0);
 }
@@ -3719,7 +3737,7 @@ pcap_read_dead(pcap_t *p, int cnt _U_, pcap_handler callback _U_,
 }
 
 static int
-pcap_inject_dead(pcap_t *p, const void *buf _U_, size_t size _U_)
+pcap_inject_dead(pcap_t *p, const void *buf _U_, int size _U_)
 {
        pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
            "Packets can't be sent on a pcap_open_dead pcap_t");