Import ITS#4158 fixes from HEAD

[openldap] / servers / slapd / entry.c

diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 35e3cd47dc7a75a3d72d9924d24e2c0ff11b52db..e2781a48c00a4c04b48285a2c619bf5e521b7b1d 100644 (file)
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -1,8 +1,27 @@
 /* entry.c - routines for dealing with entries */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
 
 #include "portable.h"
@@ -66,9 +85,10 @@ str2entry( char *s )
         */
 
 #ifdef NEW_LOGGING
-       LDAP_LOG( OPERATION, DETAIL1, "str2entry: \"%s\"\n", s ? s : "NULL", 0, 0 );
+       LDAP_LOG( OPERATION, DETAIL1, "str2entry: \"%s\"\n",
+               s ? s : "NULL", 0, 0 );
 #else
-       Debug( LDAP_DEBUG_TRACE, "=> str2entry\n",
+       Debug( LDAP_DEBUG_TRACE, "=> str2entry: \"%s\"\n",
                s ? s : "NULL", 0, 0 );
 #endif
 
@@ -375,7 +395,7 @@ entry2str(
 }
 
 void
-entry_free( Entry *e )
+entry_clean( Entry *e )
 {
        /* free an entry structure */
        assert( e != NULL );
@@ -385,23 +405,29 @@ entry_free( Entry *e )
        e->e_private = NULL;
 
        /* free DNs */
-       if ( e->e_dn != NULL ) {
-               free( e->e_dn );
-               e->e_dn = NULL;
+       if ( !BER_BVISNULL( &e->e_name ) ) {
+               free( e->e_name.bv_val );
+               BER_BVZERO( &e->e_name );
        }
-       if ( e->e_ndn != NULL ) {
-               free( e->e_ndn );
-               e->e_ndn = NULL;
+       if ( !BER_BVISNULL( &e->e_nname ) ) {
+               free( e->e_nname.bv_val );
+               BER_BVZERO( &e->e_nname );
        }
 
-       if ( e->e_bv.bv_val != NULL ) {
+       if ( !BER_BVISNULL( &e->e_bv ) ) {
                free( e->e_bv.bv_val );
-               e->e_bv.bv_val = NULL;
+               BER_BVZERO( &e->e_bv );
        }
 
        /* free attributes */
        attrs_free( e->e_attrs );
        e->e_attrs = NULL;
+}
+
+void
+entry_free( Entry *e )
+{
+       entry_clean( e );
 
        free( e );
 }
@@ -639,6 +665,16 @@ int entry_decode(struct berval *bv, Entry **e)
        BerVarray bptr;
 
        i = entry_getlen(&ptr);
+       if (!i) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, INFO, 
+                       "entry_decode: entry length was zero\n", 0, 0, 0);
+#else
+               Debug( LDAP_DEBUG_ANY,
+                       "entry_decode: entry length was zero\n", 0, 0, 0);
+#endif
+               return LDAP_OTHER;
+       }
        x = ch_calloc(1, i);
        i = entry_getlen(&ptr);
        x->e_name.bv_val = (char *) ptr;