back out an irrelevant diff (sorry)

diff --git a/lib/isc/hash.c b/lib/isc/hash.c
index ce057c79eae847c18dfe66edb12f183928b071a5..f66556e686988c25369f4b7ee68fba98f9012092 100644 (file)
--- a/lib/isc/hash.c
+++ b/lib/isc/hash.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hash.c,v 1.13.332.1 2009/05/06 23:34:30 jinmei Exp $ */
+/* $Id: hash.c,v 1.13.332.2 2009/05/06 23:37:20 jinmei Exp $ */
 
 /*! \file
  * Some portion of this code was derived from universal hash function
@@ -293,7 +293,6 @@ static void
 destroy(isc_hash_t **hctxp) {
        isc_hash_t *hctx;
        isc_mem_t *mctx;
-       unsigned char canary0[4], canary1[4];
 
        REQUIRE(hctxp != NULL && *hctxp != NULL);
        hctx = *hctxp;
@@ -313,10 +312,7 @@ destroy(isc_hash_t **hctxp) {
 
        DESTROYLOCK(&hctx->lock);
 
-       memcpy(canary0, hctx + 1, sizeof(canary0));
        memset(hctx, 0, sizeof(isc_hash_t));
-       memcpy(canary1, hctx + 1, sizeof(canary1));
-       INSIST(memcmp(canary0, canary1, sizeof(canary0)) == 0);
        isc_mem_put(mctx, hctx, sizeof(isc_hash_t));
        isc_mem_detach(&mctx);
 }