diff options
| author | Wade Berrier <wade@mono-cvs.ximian.com> | 2007-08-24 04:04:48 +0400 |
|---|---|---|
| committer | Wade Berrier <wade@mono-cvs.ximian.com> | 2007-08-24 04:04:48 +0400 |
| commit | efba67629a8dd751e4ae963c818f93ecfcd69db2 (patch) | |
| tree | ec539556513a18010f8dd5e2f60ddda8ded53656 | |
| parent | 0b3deddb98b7aab0c0958c939d5d507f94584d86 (diff) | |
Merge 84747 from trunk
svn path=/branches/mono-1-2-5/mono/; revision=84767
| -rw-r--r-- | mono/metadata/ChangeLog | 5 | ||||
| -rw-r--r-- | mono/metadata/marshal.c | 2 |
2 files changed, 6 insertions, 1 deletions
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 <robertj@gmx.net> + + * marshal.c (Marshal_ReAllocHGlobal) : Fix GlobalReAlloc's flags. + Fixes #82499. + 2007-07-03 Jonathan Chambers <joncham@gmail.com> * 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 |