From c9941e6e60533a7b3774bc03a03cd00187cf6d71 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 23 Sep 1999 20:54:41 +0000 Subject: [PATCH] Don't initialize pointers to NULL using calloc(). --- servers/slapd/entry.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c index 0f7f3d334e..62bd7b6cf1 100644 --- a/servers/slapd/entry.c +++ b/servers/slapd/entry.c @@ -64,7 +64,7 @@ str2entry( char *s ) next = s; /* initialize reader/writer lock */ - e = (Entry *) ch_calloc( 1, sizeof(Entry) ); + e = (Entry *) ch_malloc( sizeof(Entry) ); if( e == NULL ) { Debug( LDAP_DEBUG_TRACE, @@ -73,14 +73,18 @@ str2entry( char *s ) return( NULL ); } + /* initialize entry */ e->e_id = NOID; + e->e_dn = NULL; + e->e_ndn = NULL; + e->e_attrs = NULL; e->e_private = NULL; /* dn + attributes */ - e->e_attrs = NULL; vals[0] = &bval; vals[1] = NULL; ptype[0] = '\0'; + while ( (s = ldif_getline( &next )) != NULL ) { if ( *s == '\n' || *s == '\0' ) { break; -- 2.39.5