ci,x.json2.decoder2: fix sanitize jobs

spytheman · spytheman · commit b511f2239e78 · 2025-07-26T16:53:53.000+03:00
diff --git a/vlib/x/json2/decoder2/decode_sumtype.v b/vlib/x/json2/decoder2/decode_sumtype.v
@@ -164,7 +164,8 @@ fn (mut decoder Decoder) check_struct_type_valid[T](s T, current_node Node[Value
 		}
 
 		if unsafe {
-			vmemcmp(decoder.json.str + key_info.position, type_field.str, type_field.len) == 0
+			key_info.position + type_field.len <= decoder.json.len
+				&& 0 == vmemcmp(decoder.json.str + key_info.position, type_field.str, type_field.len)
 		} {
 			// find type field
 			type_field_node = type_field_node.next
@@ -184,8 +185,8 @@ fn (mut decoder Decoder) check_struct_type_valid[T](s T, current_node Node[Value
 		unsafe {
 		}
 		if unsafe {
-			vmemcmp(decoder.json.str + type_field_node.value.position + 1, variant_name.str,
-				variant_name.len) == 0
+			type_field_node.value.position + 1 + variant_name.len <= decoder.json.len
+				&& 0 == vmemcmp(decoder.json.str + type_field_node.value.position + 1, variant_name.str, variant_name.len)
 		} {
 			return true
 		}

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,8 @@ fn (mut decoder Decoder) check_struct_type_valid[T](s T, current_node Node[Value`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`if unsafe {`
`167`		`- vmemcmp(decoder.json.str + key_info.position, type_field.str, type_field.len) == 0`
	`167`	`+ key_info.position + type_field.len <= decoder.json.len`
	`168`	`+ && 0 == vmemcmp(decoder.json.str + key_info.position, type_field.str, type_field.len)`
`168`	`169`	`} {`
`169`	`170`	`// find type field`
`170`	`171`	`type_field_node = type_field_node.next`
`@@ -184,8 +185,8 @@ fn (mut decoder Decoder) check_struct_type_valid[T](s T, current_node Node[Value`
`184`	`185`	`unsafe {`
`185`	`186`	`}`
`186`	`187`	`if unsafe {`
`187`		`- vmemcmp(decoder.json.str + type_field_node.value.position + 1, variant_name.str,`
`188`		`- variant_name.len) == 0`
	`188`	`+ type_field_node.value.position + 1 + variant_name.len <= decoder.json.len`
	`189`	`+ && 0 == vmemcmp(decoder.json.str + type_field_node.value.position + 1, variant_name.str, variant_name.len)`
`189`	`190`	`} {`
`190`	`191`	`return true`
`191`	`192`	`}`