PATCH: fix uninitialized memory returned by TOOLBAR_GetButton()

Adam Gundy arg at cyberscience.com
Wed Apr 2 10:21:59 CST 2003


patch to fix uninitialized memory detected by valgrind.

2003-04-02  Adam Gundy  <arg at cyberscience.com>

        * dlls/comctl32/toolbar.c: Zero initialize the reserved bytes in
          the toolbar details returned by TOOLBAR_GetButton().
          MFC compares these structures using memcmp() sometimes, so it
          needs the entire structure to be initialized.

Index: dlls/comctl32/toolbar.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/toolbar.c,v
retrieving revision 1.129
diff -u -r1.129 toolbar.c
--- dlls/comctl32/toolbar.c     7 Mar 2003 23:02:46 -0000       1.129
+++ dlls/comctl32/toolbar.c     2 Apr 2003 16:14:54 -0000
@@ -3026,6 +3026,8 @@
     lpTbb->idCommand = btnPtr->idCommand;
     lpTbb->fsState   = btnPtr->fsState;
     lpTbb->fsStyle   = btnPtr->fsStyle;
+    lpTbb->bReserved[0] = 0;
+    lpTbb->bReserved[1] = 0;
     lpTbb->dwData    = btnPtr->dwData;
     lpTbb->iString   = btnPtr->iString;



Seeya,
 Adam
--
Real Programmers don't comment their code. If it was hard to write,
it should be hard to read, and even harder to modify.
These are all my own opinions.




More information about the wine-patches mailing list