rpcrt4: Fix crash in rpcrt4_ncalrpc_parse_top_of_tower due to unconditionally…

rpcrt4: Fix crash in rpcrt4_ncalrpc_parse_top_of_tower due to unconditionally dereferencing networkaddr and endpoint variables. These can be NULL when parts of the tower are not required.

rpcrt4: Fix crash in rpcrt4_ncalrpc_parse_top_of_tower due to unconditionally…
498216fc · Rob Shearman · Alexandre Julliard · 54e904e7 · 498216fc
Commit 498216fc authored Aug 10, 2008 by Rob Shearman Committed by Alexandre Julliard Aug 18, 2008
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

rpc_transport.c dlls/rpcrt4/rpc_transport.c +3 -3

No files found.
--- a/dlls/rpcrt4/rpc_transport.c
+++ b/dlls/rpcrt4/rpc_transport.c
@@ -706,9 +706,6 @@ static RPC_STATUS rpcrt4_ncalrpc_parse_top_of_tower(const unsigned char *tower_d

    TRACE("(%p, %d, %p, %p)\n", tower_data, (int)tower_size, networkaddr, endpoint);

-    *networkaddr = NULL;
-    *endpoint = NULL;
-
    if (tower_size < sizeof(*pipe_floor))
        return EPT_S_NOT_REGISTERED;

@@ -720,6 +717,9 @@ static RPC_STATUS rpcrt4_ncalrpc_parse_top_of_tower(const unsigned char *tower_d
        (pipe_floor->count_rhs > tower_size))
        return EPT_S_NOT_REGISTERED;

+    if (networkaddr)
+        *networkaddr = NULL;
+
    if (endpoint)
    {
        *endpoint = I_RpcAllocate(pipe_floor->count_rhs);