X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/2041ec98bdd4a54863985330d4bebb1cb7f991e5..HEAD:/print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index aaf31b4e..269b41fb 100644
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -301,9 +301,11 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	ND_TCHECK_SIZE(ip6);
 
 	/*
-	 * Cut off the snapshot length to the end of the IP payload.
+	 * Cut off the snapshot length to the end of the IP payload
+	 * or the end of the data in which it's contained, whichever
+	 * comes first.
 	 */
-	if (!nd_push_snaplen(ndo, bp, len)) {
+	if (!nd_push_snaplen(ndo, bp, ND_MIN(length, len))) {
 		(*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC,
 			"%s: can't push snaplen on buffer stack", __func__);
 	}