From fcf945f7479d8770fc25f5bd7ec2cce1f9b77b28 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 1 Dec 2021 09:16:45 -0800
Subject: wiretap: Fix an underflow in pcapng.

Make sure account for our rounded option length when we process
opt_endofopt. Fixes #17755.
---
 wiretap/pcapng.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wiretap')

diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c
index 6e4004c22b..9a0aa99806 100644
--- a/wiretap/pcapng.c
+++ b/wiretap/pcapng.c
@@ -987,7 +987,7 @@ pcapng_process_options(FILE_T fh, wtapng_block_t *wblock,
                     ws_debug("%u bytes after opt_endofopt", opt_bytes_remaining);
                 }
                 /* padding should be ok here, just get out of this */
-                opt_bytes_remaining = 0;
+                opt_bytes_remaining = rounded_option_length;
                 break;
             case(OPT_COMMENT):
                 pcapng_process_string_option(wblock, option_code, option_length,
-- 
cgit v1.2.3