projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[runtime] Fix the native-to-managed marshalling of null blittable arrays. Fixes ...
[mono.git]
/
mono
/
metadata
/
marshal.c
diff --git
a/mono/metadata/marshal.c
b/mono/metadata/marshal.c
index acf4e390fee995fdeb12b02a67ffddc9b989d0c2..0e48835962ebee18924f74593427e823e6ce38e9 100644
(file)
--- a/
mono/metadata/marshal.c
+++ b/
mono/metadata/marshal.c
@@
-6678,7
+6678,8
@@
emit_marshal_array (EmitMarshalContext *m, int argnum, MonoType *t,
mono_mb_emit_icon (mb, esize);
mono_mb_emit_byte (mb, CEE_MUL);
mono_mb_emit_byte (mb, CEE_PREFIX1);
- mono_mb_emit_byte (mb, CEE_CPBLK);
+ mono_mb_emit_byte (mb, CEE_CPBLK);
+ mono_mb_patch_branch (mb, label1);
break;
}