CHANGES: Add changes backported to 4.99

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 2f2b150316a67f8e442857bb9e5d768f114f3a47..6768499adf77cfd28d210aaad0110b3ce54ef70d 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -21,9 +21,7 @@
 
 /* \summary: Ethernet printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -238,7 +236,7 @@ recurse:
                         */
                        length_type = GET_BE_U_2(p);
 
-                       ND_LCHECK_U(caplen, 2);
+                       ND_ICHECK_U(caplen, <, 2);
                        length -= 2;
                        caplen -= 2;
                        p += 2;
@@ -306,7 +304,10 @@ recurse:
                 * Cut off the snapshot length to the end of the
                 * payload.
                 */
-               nd_push_snaplen(ndo, p, length);
+               if (!nd_push_snaplen(ndo, p, length)) {
+                       (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
+                               "%s: can't push snaplen on buffer stack", __func__);
+               }
 
                if (ndo->ndo_eflag) {
                        ND_PRINT("802.3");
@@ -409,7 +410,7 @@ invalid:
 }
 
 /*
- * Print an Ethernet frame while specyfing a non-standard Ethernet header
+ * Print an Ethernet frame while specifying a non-standard Ethernet header
  * length.
  * This might be encapsulated within another frame; we might be passed
  * a pointer to a function that can print header information for that