[RPCRT4]

ThFabba · ThFabba · commit 9ad74ea48e3b · 2015-04-06T08:57:12.000Z
- Avoid double free introduced in r63605.
CORE-8200

svn path=/trunk/; revision=67071
diff --git a/reactos/dll/win32/rpcrt4/ndr_stubless.c b/reactos/dll/win32/rpcrt4/ndr_stubless.c
@@ -1109,7 +1109,9 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg,
                 call_marshaller(pStubMsg, pArg, &params[i]);
             break;
         case STUBLESS_FREE:
-            if (params[i].attr.ServerAllocSize)
+            if (params[i].attr.MustFree)
+                break;
+            else if (params[i].attr.ServerAllocSize)
             {
                 HeapFree(GetProcessHeap(), 0, *(void **)pArg);
             }

Original file line number	Diff line number	Diff line change
`@@ -1109,7 +1109,9 @@ static LONG_PTR stub_do_args(MIDL_STUB_MESSAGE pStubMsg,`
`1109`	`1109`	`call_marshaller(pStubMsg, pArg, &params[i]);`
`1110`	`1110`	`break;`
`1111`	`1111`	`case STUBLESS_FREE:`
`1112`		`- if (params[i].attr.ServerAllocSize)`
	`1112`	`+ if (params[i].attr.MustFree)`
	`1113`	`+ break;`
	`1114`	`+ else if (params[i].attr.ServerAllocSize)`
`1113`	`1115`	`{`
`1114`	`1116`	`HeapFree(GetProcessHeap(), 0, (void *)pArg);`
`1115`	`1117`	`}`