Skip to content

W
wine-winehq
Commit ce220e2b authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard
Browse files
Options

rpcrt4: Free the base pointer in PointerFree when freeing a pointer with RPC_FC_P_DEREF.

parent d5ff3467
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
dlls/rpcrt4/ndr_marshall.c
View file @ ce220e2b
...@@ -1245,6 +1245,7 @@ static void PointerFree(PMIDL_STUB_MESSAGE pStubMsg, ...@@ -1245,6 +1245,7 @@ static void PointerFree(PMIDL_STUB_MESSAGE pStubMsg,
unsigned type = pFormat[0], attr = pFormat[1]; unsigned type = pFormat[0], attr = pFormat[1];
PFORMAT_STRING desc; PFORMAT_STRING desc;
NDR_FREE m; NDR_FREE m;
unsigned char *current_pointer = Pointer;
TRACE("(%p,%p,%p)\n", pStubMsg, Pointer, pFormat); TRACE("(%p,%p,%p)\n", pStubMsg, Pointer, pFormat);
TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr); TRACE("type=0x%x, attr=", type); dump_pointer_attr(attr);
...@@ -1263,12 +1264,12 @@ static void PointerFree(PMIDL_STUB_MESSAGE pStubMsg, ...@@ -1263,12 +1264,12 @@ static void PointerFree(PMIDL_STUB_MESSAGE pStubMsg,
} }
if (attr & RPC_FC_P_DEREF) { if (attr & RPC_FC_P_DEREF) {
Pointer = *(unsigned char**)Pointer; current_pointer = *(unsigned char**)Pointer;
TRACE("deref => %p\n", Pointer); TRACE("deref => %p\n", current_pointer);
} }
m = NdrFreer[*desc & NDR_TABLE_MASK]; m = NdrFreer[*desc & NDR_TABLE_MASK];
if (m) m(pStubMsg, Pointer, desc); if (m) m(pStubMsg, current_pointer, desc);
/* this check stops us from trying to free buffer memory. we don't have to /* this check stops us from trying to free buffer memory. we don't have to
* worry about clients, since they won't call this function. * worry about clients, since they won't call this function.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment