rpcrt4: Use abrtitrary pointer identifiers when marshalling pointers instead of…

rpcrt4: Use abrtitrary pointer identifiers when marshalling pointers instead of using pointer values. This ensures that no information about the server memory layout is leaked to clients.

rpcrt4: Use abrtitrary pointer identifiers when marshalling pointers instead of…
4bde42aa · Rob Shearman · Alexandre Julliard · 6cf9e441 · 4bde42aa
Commit 4bde42aa authored Jun 20, 2008 by Rob Shearman Committed by Alexandre Julliard Jun 21, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

ndr_marshall.c dlls/rpcrt4/ndr_marshall.c +3 -1

No files found.
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -110,6 +110,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
        ERR("buffer overflow %d bytes\n", _Msg->Buffer - ((unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength)); \
  } while (0)

+#define NDR_POINTER_ID_BASE 0x20000
+#define NDR_POINTER_ID(pStubMsg) (NDR_POINTER_ID_BASE + ((pStubMsg)->UniquePtrCount++) * 4)
 #define NDR_TABLE_SIZE 128
 #define NDR_TABLE_MASK 127

@@ -1221,7 +1223,7 @@ static void PointerMarshall(PMIDL_STUB_MESSAGE pStubMsg,
      pointer_needs_marshaling = 1;
    else
      pointer_needs_marshaling = 0;
-    pointer_id = (ULONG)Pointer;
+    pointer_id = Pointer ? NDR_POINTER_ID(pStubMsg) : 0;
    TRACE("writing 0x%08x to buffer\n", pointer_id);
    NDR_LOCAL_UINT32_WRITE(Buffer, pointer_id);
    break;