projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7d238dd
)
[mini] Fail methods that try to throw scalars. Fix hard crash from #42417. (#3312)
author
Rodrigo Kumpera
<kumpera@gmail.com>
Thu, 21 Jul 2016 17:48:34 +0000
(10:48 -0700)
committer
Zoltan Varga
<vargaz@gmail.com>
Thu, 21 Jul 2016 17:48:34 +0000
(13:48 -0400)
mono/mini/method-to-ir.c
patch
|
blob
|
history
diff --git
a/mono/mini/method-to-ir.c
b/mono/mini/method-to-ir.c
index c7ca275b134fe12dccc3803d1958b81a1bad99b7..386a319cc50234118d4e32d940a370c1d0833609 100644
(file)
--- a/
mono/mini/method-to-ir.c
+++ b/
mono/mini/method-to-ir.c
@@
-12283,6
+12283,9
@@
mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
}
case CEE_THROW:
CHECK_STACK (1);
+ if (sp [-1]->type != STACK_OBJ)
+ UNVERIFIED;
+
MONO_INST_NEW (cfg, ins, OP_THROW);
--sp;
ins->sreg1 = sp [0]->dreg;