Rob Shearman : rpcrt4:
Correctly align the results in the RPC Bind Ack packet.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Nov 10 07:44:38 CST 2006
Module: wine
Branch: master
Commit: 44922d29db4aedc83e6718c8445790af8d4d98db
URL: http://source.winehq.org/git/wine.git/?a=commit;h=44922d29db4aedc83e6718c8445790af8d4d98db
Author: Rob Shearman <rob at codeweavers.com>
Date: Fri Nov 10 11:01:35 2006 +0000
rpcrt4: Correctly align the results in the RPC Bind Ack packet.
---
dlls/rpcrt4/rpc_defs.h | 4 ++--
dlls/rpcrt4/rpc_message.c | 11 +++++++----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/dlls/rpcrt4/rpc_defs.h b/dlls/rpcrt4/rpc_defs.h
index 4ee840c..7499dcd 100644
--- a/dlls/rpcrt4/rpc_defs.h
+++ b/dlls/rpcrt4/rpc_defs.h
@@ -88,9 +88,8 @@ #include "poppack.h"
typedef struct
{
- unsigned char padding1[2]; /* Force alignment! */
unsigned char num_results; /* Number of results */
- unsigned char padding2[3]; /* Force alignment! */
+ unsigned char reserved[3]; /* Force alignment! */
struct {
unsigned short result;
unsigned short reason;
@@ -106,6 +105,7 @@ typedef struct
/*
* Following this header are these fields:
* RpcAddressString server_address;
+ * [0 - 3 bytes of padding so that results is 4-byte aligned]
* RpcResults results;
* RPC_SYNTAX_IDENTIFIER transfer;
*/
diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c
index 3afbf79..9c7ea15 100644
--- a/dlls/rpcrt4/rpc_message.c
+++ b/dlls/rpcrt4/rpc_message.c
@@ -49,6 +49,7 @@ #define AUTH_ALIGNMENT 16
/* gets the amount needed to round a value up to the specified alignment */
#define ROUND_UP_AMOUNT(value, alignment) \
(((alignment) - (((value) % (alignment)))) % (alignment))
+#define ROUND_UP(value, alignment) (((value) + ((alignment) - 1)) & ~((alignment)-1))
static RPC_STATUS I_RpcReAllocateBuffer(PRPC_MESSAGE pMsg);
@@ -230,9 +231,10 @@ RpcPktHdr *RPCRT4_BuildBindAckHeader(uns
RpcResults *results;
RPC_SYNTAX_IDENTIFIER *transfer_id;
- header_size = sizeof(header->bind_ack) + sizeof(RpcResults) +
- sizeof(RPC_SYNTAX_IDENTIFIER) + sizeof(RpcAddressString) +
- strlen(ServerAddress);
+ header_size = sizeof(header->bind_ack) +
+ ROUND_UP(FIELD_OFFSET(RpcAddressString, string[strlen(ServerAddress) + 1]), 4) +
+ sizeof(RpcResults) +
+ sizeof(RPC_SYNTAX_IDENTIFIER);
header = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, header_size);
if (header == NULL) {
@@ -246,7 +248,8 @@ RpcPktHdr *RPCRT4_BuildBindAckHeader(uns
server_address = (RpcAddressString*)(&header->bind_ack + 1);
server_address->length = strlen(ServerAddress) + 1;
strcpy(server_address->string, ServerAddress);
- results = (RpcResults*)((ULONG_PTR)server_address + sizeof(RpcAddressString) + server_address->length - 1);
+ /* results is 4-byte aligned */
+ results = (RpcResults*)((ULONG_PTR)server_address + ROUND_UP(FIELD_OFFSET(RpcAddressString, string[server_address->length]), 4));
results->num_results = 1;
results->results[0].result = Result;
results->results[0].reason = Reason;
More information about the wine-cvs
mailing list