commit 3186bd230077a6d22fef2cbe9a35f98a975c53fc
author Mike Hearn <mh@codeweavers.com> Mon Jun 28 23:51:24 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Jun 28 23:51:24 2004 +0000
tree c9a8b91e3e89c5a73ccb4c0a8213deee54fae9cf
parent 27a7a7a69abb3b5848a021ff3427f33ff414adfa

Make typelib marshaller safe for systems that don't allow executable
code on the heap, plug a leak of the assembly stub block.

dlls/oleaut32/tmarshal.c

diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c
index f20fa5e..fb584f1 100644
--- a/dlls/oleaut32/tmarshal.c
+++ b/dlls/oleaut32/tmarshal.c
@@ -340,6 +340,7 @@
     This->ref--;
     if (This->ref) return This->ref;
     if (This->chanbuf) IRpcChannelBuffer_Release(This->chanbuf);
+    VirtualFree(This->asmstubs, 0, MEM_RELEASE);
     HeapFree(GetProcessHeap(),0,This);
     return 0;
 }
@@ -1362,12 +1363,18 @@
 	return hres;
     }
     nroffuncs = _nroffuncs(tinfo);
-    proxy = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(TMProxyImpl));
+    proxy = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TMProxyImpl));
     if (!proxy) return E_OUTOFMEMORY;
-    proxy->asmstubs=HeapAlloc(GetProcessHeap(),0,sizeof(TMAsmProxy)*nroffuncs);
 
     assert(sizeof(TMAsmProxy) == 12);
 
+    proxy->asmstubs = VirtualAlloc(NULL, sizeof(TMAsmProxy) * nroffuncs, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
+    if (!proxy->asmstubs) {
+        ERR("Could not commit pages for proxy thunks\n");
+        HeapFree(GetProcessHeap(), 0, proxy);
+        return E_OUTOFMEMORY;
+    }
+
     proxy->lpvtbl = HeapAlloc(GetProcessHeap(),0,sizeof(LPBYTE)*nroffuncs);
     for (i=0;i<nroffuncs;i++) {
 	int		nrofargs;