From efba67629a8dd751e4ae963c818f93ecfcd69db2 Mon Sep 17 00:00:00 2001 From: Wade Berrier Date: Fri, 24 Aug 2007 00:04:48 +0000 Subject: Merge 84747 from trunk svn path=/branches/mono-1-2-5/mono/; revision=84767 --- mono/metadata/ChangeLog | 5 +++++ mono/metadata/marshal.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index 0efbb3c80f8..cab85fd736a 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,8 @@ +2007-08-23 Robert Jordan + + * marshal.c (Marshal_ReAllocHGlobal) : Fix GlobalReAlloc's flags. + Fixes #82499. + 2007-07-03 Jonathan Chambers * marshal.c: Implement COM Objects as return type for diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c index 297b82be5b8..022a16e4315 100644 --- a/mono/metadata/marshal.c +++ b/mono/metadata/marshal.c @@ -10673,7 +10673,7 @@ ves_icall_System_Runtime_InteropServices_Marshal_ReAllocHGlobal (gpointer ptr, i } #ifdef PLATFORM_WIN32 - res = GlobalReAlloc (ptr, (gulong)size, 0); + res = GlobalReAlloc (ptr, (gulong)size, GMEM_MOVEABLE); #else res = g_try_realloc (ptr, (gulong)size); #endif -- cgit v1.2.3