X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fzn_malloc.c;h=dbd8863cb515424db20d01f6ad9be01a96d567d0;hb=2bfe79fe884565801600e309d1fcbefa41fb0f4b;hp=14d2113f9a59762e0e76bc1df701545cb0726238;hpb=238f6333d26946ecbd93d285b75b94a92295e98a;p=openldap
diff --git a/servers/slapd/zn_malloc.c b/servers/slapd/zn_malloc.c
index 14d2113f9a..dbd8863cb5 100644
--- a/servers/slapd/zn_malloc.c
+++ b/servers/slapd/zn_malloc.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$*/
/* This work is part of OpenLDAP Software .
*
- * Copyright 2003-2004 The OpenLDAP Foundation.
+ * Copyright 2003-2006 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -13,15 +13,15 @@
* top-level directory of the distribution or, alternatively, at
* .
*/
-/* Copyright 2004 IBM Corporation
+/* Portions Copyright 2004 IBM Corporation
* All rights reserved.
- * Redisribution and use in source and binary forms, with or without
- * modification, are permitted only as authorizd by the OpenLADP
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
* Public License.
*/
/* ACKNOWLEDGEMENTS
- * This work originally developed by Jong-Hyuk Choi
- * 2004/12/09 jongchoi@OpenLDAP.org
+ * This work originally developed by Jong-Hyuk Choi for inclusion in
+ * OpenLDAP Software.
*/
#include "portable.h"
@@ -542,7 +542,7 @@ slap_zn_free(void *ptr, void *ctx)
Debug(LDAP_DEBUG_ANY, "slap_zn_free: "
"free object not found while bit is clear.\n",
0, 0, 0);
- assert(zo);
+ assert(zo != NULL);
}
} else {
@@ -604,7 +604,7 @@ slap_zn_free(void *ptr, void *ctx)
Debug(LDAP_DEBUG_ANY, "slap_zn_free: "
"free object not found while bit is clear.\n",
0, 0, 0 );
- assert( zo );
+ assert(zo != NULL);
}
} else {