Merge pull request #717 from mono/client_websockets_impl

[mono.git] / mono / metadata / mono-ptr-array.h

diff --git a/mono/metadata/mono-ptr-array.h b/mono/metadata/mono-ptr-array.h
index 94b1f625d0b9aa58555077e426c606569b5b8c7d..a828f4e9f4db396d02d12dde27384493aae46a81 100644 (file)
--- a/mono/metadata/mono-ptr-array.h
+++ b/mono/metadata/mono-ptr-array.h
@@ -41,7 +41,7 @@ typedef struct {
 #define mono_ptr_array_append(ARRAY, VALUE) do { \
        if ((ARRAY).size >= (ARRAY).capacity) {\
        void *__tmp = mono_gc_alloc_fixed (sizeof (void*) * (ARRAY).capacity * 2, mono_gc_make_root_descr_all_refs ((ARRAY).capacity * 2)); \
-               memcpy (__tmp, (ARRAY).data, (ARRAY).capacity * sizeof (void*)); \
+               mono_gc_memmove (__tmp, (ARRAY).data, (ARRAY).capacity * sizeof (void*)); \
                if ((ARRAY).capacity > MONO_PTR_ARRAY_MAX_ON_STACK)     \
                        mono_gc_free_fixed ((ARRAY).data);      \
                (ARRAY).data = __tmp;   \
@@ -62,4 +62,13 @@ typedef struct {
 
 #define mono_ptr_array_size(ARRAY) ((ARRAY).size)
 
+#define mono_ptr_array_reset(ARRAY) do { \
+       (ARRAY).size = 0; \
+} while (0)
+
+#define mono_ptr_array_clear(ARRAY) do { \
+       (ARRAY).size = 0; \
+       mono_gc_bzero ((ARRAY).data, (ARRAY).capacity * sizeof (void*)); \
+} while (0)
+
 #endif