Rob Shearman : rpcrt4: Zero the memory of the s1 structure in test_simple_struct to avoid a Valgrind warning .

Alexandre Julliard julliard at winehq.org
Wed Jun 18 12:54:33 CDT 2008


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

Author: Rob Shearman <robertshearman at gmail.com>
Date:   Sat Jun 14 17:30:40 2008 +0100

rpcrt4: Zero the memory of the s1 structure in test_simple_struct to avoid a Valgrind warning.

---

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

diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c
index 84a3891..ecb9f57 100644
--- a/dlls/rpcrt4/tests/ndr_marshall.c
+++ b/dlls/rpcrt4/tests/ndr_marshall.c
@@ -933,6 +933,9 @@ static void test_simple_struct(void)
 
     };
 
+    /* zero the entire structure, including the holes */
+    memset(&s1, 0, sizeof(s1));
+
     /* FC_STRUCT */
     s1.s = 0x1234;
     s1.c = 0xa5;
@@ -956,7 +959,7 @@ static void test_simple_struct(void)
     }
 
     /* zero the entire structure, including the hole */
-    memset(&ps1, 0, sizeof(&ps1));
+    memset(&ps1, 0, sizeof(ps1));
 
     /* FC_PSTRUCT */
     ps1.l1 = 0xdeadbeef;




More information about the wine-cvs mailing list