Merge pull request #2481 from ludovic-henry/monoerror-mono_array_new_full

[mono.git] / mono / metadata / icall.c

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index 09db6f0c69de1e2e0c25ec05b677c61383b4a754..99611d04ccb8949e3aeb03fa15c5c74df7480ff9 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -827,9 +827,10 @@ ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_InitializeArray (MonoAr
 #define SWAP(n) {                                                              \
        guint ## n *data = (guint ## n *) mono_array_addr (array, char, 0);     \
        guint ## n *src = (guint ## n *) field_data;                            \
-       int i;                                                                  \
+       int i,                                                                  \
+           nEnt = (size / sizeof(guint ## n));                                 \
                                                                                \
-       for (i = 0; i < (size / sizeof(guint ## n)); i++) {                     \
+       for (i = 0; i < nEnt; i++) {                                            \
                data[i] = read ## n (&src[i]);                                  \
        }                                                                       \
 }