🐞 fix(parse_quic_uncryption_payload): 增加长度判断，修复长度异常时造成的内存非法读

附test/pcap/quic_len-2.pcapng为解析长度异常的包

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.8...3.10)
 
 set(lib_name quic)
 

cmake/changelog.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 work_path=$1
-branch=`git status | grep branch | awk '{print $NF}'`
+branch=`git status | grep 'On branch' | awk '{print $NF}'`
 git log --branches=$branch --no-merges --date=local --show-signature --pretty="* %ad %an %ae %nhash: %H%ncommit:%n%B"  | awk -F"-" '{print "- "$0}' | sed 's/- \*/\*/g' | sed 's/- $//g' | sed 's/-/  -/g' | sed 's/[0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}//g' > $work_path/changelog.txt

src/quic_entry.cpp

@@ -321,6 +321,8 @@ extern "C" long long QUIC_FLAG_CHANGE(char* flag_str)
 
 extern "C" void QUIC_DESTROY(void)
 {
+	MESA_destroy_runtime_log_handle(g_quic_param.logger);
+	g_quic_param.logger = NULL;
 	return ;
 }
 

src/quic_process.cpp

@@ -737,6 +737,11 @@ enum QUIC_VERSION is_quic_protocol(const char *payload, int payload_len, int *pa
 	enum QUIC_VERSION quic_version=QUIC_VERSION_UNKNOWN;
 	unsigned char frame_type=(unsigned char)(payload[0]);
 
+	if(payload_len<=4)
+	{
+		return QUIC_VERSION_UNKNOWN;
+	}
+
 	if(frame_type&QUIC_LONG_HEADER_MASK)
 	{
 		quic_version=identify_quic_version(payload, payload_len, payload_offset);
@@ -773,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)	||

test/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.8...3.10)
 
 set(lib_name quic)
 project(${lib_name}_test)