Skip to content

Commit 9333e46

Browse files
authored
[mono][tests] Throw InvalidProgramException when ENDFILTER has invalid value type or invalid number of values (#79394)
* Throw InvalidProgramException when ENDFILTER has invalid value type or invalid number of values
1 parent 8199d0a commit 9333e46

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/mono/mono/mini/interp/transform.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7577,8 +7577,14 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
75777577
case CEE_UNUSED57: ves_abort(); break;
75787578
#endif
75797579
case CEE_ENDFILTER:
7580+
td->sp--;
7581+
if (td->sp != td->stack || td->sp [0].type != STACK_TYPE_I4) {
7582+
mono_error_set_generic_error (error, "System", "InvalidProgramException", "");
7583+
goto exit;
7584+
}
7585+
75807586
interp_add_ins (td, MINT_ENDFILTER);
7581-
interp_ins_set_sreg (td->last_ins, td->sp [-1].local);
7587+
interp_ins_set_sreg (td->last_ins, td->sp [0].local);
75827588
++td->ip;
75837589
link_bblocks = FALSE;
75847590
break;

src/tests/issues.targets

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2567,12 +2567,6 @@
25672567
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39946/b39946/**">
25682568
<Issue>https://github.com/dotnet/runtime/issues/54393</Issue>
25692569
</ExcludeList>
2570-
<ExcludeList Include = "$(XunitTestBinBase)/baseservices/varargs/varargsupport/**">
2571-
<Issue>https://github.com/dotnet/runtime/issues/54401</Issue>
2572-
</ExcludeList>
2573-
<ExcludeList Include = "$(XunitTestBinBase)/baseservices/varargs/varargsupport_r/**">
2574-
<Issue>https://github.com/dotnet/runtime/issues/54401</Issue>
2575-
</ExcludeList>
25762570
<ExcludeList Include = "$(XunitTestBinBase)/JIT/Regression/VS-ia64-JIT/M00/b109878/b109878/**">
25772571
<Issue>https://github.com/dotnet/runtime/issues/54392</Issue>
25782572
</ExcludeList>

0 commit comments

Comments
 (0)