Merge branch 'dbus-1.4' rejecting commit 4ebb275ab7b6f71d5

[platform/upstream/dbus.git] / dbus / dbus-sha.c

diff --git a/dbus/dbus-sha.c b/dbus/dbus-sha.c
index df34cc8..d182752 100644 (file)
--- a/dbus/dbus-sha.c
+++ b/dbus/dbus-sha.c
@@ -22,6 +22,7 @@
  *
  */
 
+#include <config.h>
 #include "dbus-internals.h"
 #include "dbus-sha.h"
 #include "dbus-marshal-basic.h" /* for byteswap routines */
@@ -465,7 +466,7 @@ _dbus_sha_final (DBusSHAContext   *context,
   /* some kind of security paranoia, though it seems pointless
    * to me given the nonzeroed stuff flying around
    */
-  memset ((void*)context, '\0', sizeof (DBusSHAContext));
+  _DBUS_ZERO(*context);
 
   return TRUE;
 }