Rob Shearman : rpcrt4: Never allocate memory for the discriminant in union_arm_unmarshall as the memory is part of the union and has already been allocated .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 27030599337d3617a1bd14662b6ea6d6ff2e6979
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=27030599337d3617a1bd14662b...

Author: Rob Shearman 
Date:   Mon Jul 16 15:03:15 2007 +0100

rpcrt4: Never allocate memory for the discriminant in union_arm_unmarshall as the memory is part of the union and has already been allocated.

---

dlls/rpcrt4/ndr_marshall.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index dd5a991..26a55b1 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -4556,7 +4556,7 @@ static unsigned char *union_arm_unmarshall(PMIDL_STUB_MESSAGE pStubMsg,
     if((type & 0xff00) == 0x8000)
     {
         unsigned char basetype = LOBYTE(type);
-        return NdrBaseTypeUnmarshall(pStubMsg, ppMemory, &basetype, fMustAlloc);
+        return NdrBaseTypeUnmarshall(pStubMsg, ppMemory, &basetype, FALSE);
     }
     else
     {