From 4d731800bf93d744d8cd669cc3e78227566ada62 Mon Sep 17 00:00:00 2001
From: yangwei <yangwei@geedgenetworks.com>
Date: Fri, 28 Jul 2023 23:24:57 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(parse=5Fquic=5Funcryption=5F?=
 =?UTF-8?q?payload):=20=E5=A2=9E=E5=8A=A0=E9=95=BF=E5=BA=A6=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=95=BF=E5=BA=A6=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E6=97=B6=E9=80=A0=E6=88=90=E7=9A=84=E5=86=85=E5=AD=98?=
 =?UTF-8?q?=E9=9D=9E=E6=B3=95=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

附test/pcap/quic_len-2.pcapng为解析长度异常的包
---
 src/quic_process.cpp         |   6 +++++-
 test/pcap/quic_len_-2.pcapng | Bin 0 -> 436 bytes
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 test/pcap/quic_len_-2.pcapng

diff --git a/src/quic_process.cpp b/src/quic_process.cpp
index fe86a46..4b677c6 100644
--- a/src/quic_process.cpp
+++ b/src/quic_process.cpp
@@ -778,7 +778,11 @@ unsigned char parse_quic_all_version(struct quic_info *quic_info, const char *pa
 	
 	if(quic_version>=GQUIC_VERSION_Q001 && quic_version<=GQUIC_VERSION_Q048)
 	{
-		return parse_quic_uncryption_payload(quic_info, payload+payload_offset, payload_len-payload_offset, thread_seq);
+		if(payload_len > payload_offset)
+		{
+			return parse_quic_uncryption_payload(quic_info, payload+payload_offset, payload_len-payload_offset, thread_seq);
+		}
+		return PARSE_RESULT_VERSION;
 	}
 	else if(((quic_version>=MVFST_VERSION_00 && quic_version<=MVFST_VERSION_0F)		||
 						(quic_version>=GQUIC_VERSION_Q049 && quic_version<=GQUIC_VERSION_Q059)	||
diff --git a/test/pcap/quic_len_-2.pcapng b/test/pcap/quic_len_-2.pcapng
new file mode 100644
index 0000000000000000000000000000000000000000..44f3965cd07680f8e4231c5061676ad0692fd9e3
GIT binary patch
literal 436
zcmd<$<>flUz`)>Zqb<b<r2j(!BZC=(dum>4QDRAIib7gZey&1hUO{PzLRw}{s)BxK
zacWVqep$A@OMZD?PJUuav3^lvxn4;{i5>$369Wf>V?hB>ov$G?gC;|6VzPg*f}ydV
ziJqa3LQ-jFPKtt&k(-5)f`&_CQF&$_kf&#=XP^nRpM^n#Aw07vwKyZOC|kiq&p^*a
zL8A;z>l)~$rzRSjq?njlq*x{=f|N6W+zxWL3zP<#z{DWS;Fg%3s^ICSqu`lakY5CJ
zHpmAasTB$?rMU$_wVXg*oIn}`KziALcnydH1WN_V#9!QJ-qHnRgK*C4Z9=gOK3}8V
z`5PM<n7!NXCICel0tD++I2s)ve9&hBae;sl$WMI6z#sr*GXrrJM+Qd*L%_ZrCjS{6
zo*iqs1r%##1lsJ%z+l1p*nz=Zu+vfHhjtQ|aFhz;?rE$HDz&<g0}V{fSWPDV-_e-q
V-U-yf6yh2Y;=ssw5adsg8v%XEZ4Uqd

literal 0
HcmV?d00001