Skip to content

Commit 0db09f6

Browse files
committed
Throw ArgumentNullException if null method is passed to delegate contructor via invoke. (case 1091693)
1 parent de35c1f commit 0db09f6

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

mono/mini/jit-icalls.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,8 +1472,17 @@ ves_icall_mono_delegate_ctor (MonoObject *this_obj_raw, MonoObject *target_raw,
14721472
MonoError error;
14731473
MONO_HANDLE_DCL (MonoObject, this_obj);
14741474
MONO_HANDLE_DCL (MonoObject, target);
1475+
1476+
if (!addr) {
1477+
error_init (&error);
1478+
mono_error_set_argument_null (&error, "method", "");
1479+
mono_error_set_pending_exception (&error);
1480+
goto leave;
1481+
}
14751482
mono_delegate_ctor (this_obj, target, addr, &error);
14761483
mono_error_set_pending_exception (&error);
1484+
1485+
leave:
14771486
HANDLE_FUNCTION_RETURN ();
14781487
}
14791488

0 commit comments

Comments
 (0)