X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fresult.c;h=4cfd8f1e2b7faffb8ff12a81f8666c2779030699;hb=fe569dbb7517dbb8bf1905c4f87732197114c4cf;hp=863547f206b5646e73b1ffa940486d68ef557151;hpb=b0dfd89e1b66279eb7dfe06a35ef12605b3db06e;p=openldap

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 863547f206..4cfd8f1e2b 100644
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -38,7 +38,16 @@ static char *v2ref( BerVarray ref, const char *text )
 		}
 	}
 
-	v2 = ch_malloc( len+i+sizeof("Referral:") );
+	v2 = SLAP_MALLOC( len+i+sizeof("Referral:") );
+	if( v2 == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, ERR, "v2ref: SLAP_MALLOC failed", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY, "v2ref: SLAP_MALLOC failed", 0, 0, 0 );
+#endif
+		return NULL;
+	}
+
 	if( text != NULL ) {
 		strcpy(v2, text);
 		if( i ) {
@@ -49,7 +58,15 @@ static char *v2ref( BerVarray ref, const char *text )
 	len += sizeof("Referral:");
 
 	for( i=0; ref[i].bv_val != NULL; i++ ) {
-		v2 = ch_realloc( v2, len + ref[i].bv_len + 1 );
+		v2 = SLAP_REALLOC( v2, len + ref[i].bv_len + 1 );
+		if( v2 == NULL ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG( OPERATION, ERR, "v2ref: SLAP_MALLOC failed", 0, 0, 0 );
+#else
+			Debug( LDAP_DEBUG_ANY, "v2ref: SLAP_MALLOC failed", 0, 0, 0 );
+#endif
+			return NULL;
+		}
 		v2[len-1] = '\n';
 		AC_MEMCPY(&v2[len], ref[i].bv_val, ref[i].bv_len );
 		len += ref[i].bv_len;
@@ -213,7 +230,7 @@ send_ldap_response(
 	LDAPControl **ctrls
 )
 {
-	char berbuf[256];
+	char berbuf[LBER_ELEMENT_SIZEOF];
 	BerElement	*ber = (BerElement *)berbuf;
 	int		rc;
 	long	bytes;
@@ -224,8 +241,6 @@ send_ldap_response(
 		return;
 	}
 		
-	assert( ctrls == NULL ); /* ctrls not implemented */
-
 	ber_init_w_nullc( ber, LBER_USE_DER );
 
 #ifdef NEW_LOGGING
@@ -252,8 +267,9 @@ send_ldap_response(
 	}
 
 #ifdef LDAP_CONNECTIONLESS
-	if (conn->c_is_udp) {
-	    rc = ber_write(ber, (char *)&op->o_peeraddr, sizeof(struct sockaddr), 0);
+	if( conn->c_is_udp ) {
+	    rc = ber_write(ber,
+			(char *)&op->o_peeraddr, sizeof(struct sockaddr), 0);
 	    if (rc != sizeof(struct sockaddr)) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, ERR, 
@@ -656,7 +672,7 @@ send_search_entry(
 	LDAPControl **ctrls
 )
 {
-	char		berbuf[256];
+	char berbuf[LBER_ELEMENT_SIZEOF];
 	BerElement	*ber = (BerElement *)berbuf;
 	Attribute	*a, *aa;
 	int		i, j, rc=-1, bytes;
@@ -711,17 +727,18 @@ send_search_entry(
 
 #ifdef LDAP_CONNECTIONLESS
 	if (conn->c_is_udp) {
-	    rc = ber_write(ber, (char *)&op->o_peeraddr, sizeof(struct sockaddr), 0);
+	    rc = ber_write(ber,
+			(char *)&op->o_peeraddr, sizeof(struct sockaddr), 0);
 	    if (rc != sizeof(struct sockaddr)) {
 #ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, ERR, 
-			"send_search_entry: conn %lu  ber_printf failed\n",
-			conn ? conn->c_connid : 0, 0, 0 );
+			LDAP_LOG( OPERATION, ERR, 
+				"send_search_entry: conn %lu  ber_write failed\n",
+				conn ? conn->c_connid : 0, 0, 0 );
 #else
-		Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
+			Debug( LDAP_DEBUG_ANY, "ber_write failed\n", 0, 0, 0 );
 #endif
-		ber_free_buf( ber );
-		return( 1 );
+			ber_free_buf( ber );
+			return( 1 );
 	    }
 	}
 	if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2) {
@@ -772,7 +789,23 @@ send_search_entry(
 		size = i * sizeof(char *) + k;
 		if ( size > 0 ) {
 			char	*a_flags;
-			e_flags = ch_calloc ( 1, i * sizeof(char *) + k );
+			e_flags = SLAP_CALLOC ( 1, i * sizeof(char *) + k );
+			if( e_flags == NULL ) {
+#ifdef NEW_LOGGING
+				LDAP_LOG( OPERATION, ERR, 
+					"send_search_entry: conn %lu SLAP_CALLOC failed\n",
+					conn ? conn->c_connid : 0, 0, 0 );
+#else
+		    	Debug( LDAP_DEBUG_ANY, 
+					"send_search_entry: SLAP_CALLOC failed\n", 0, 0, 0 );
+#endif
+				ber_free( ber, 1 );
+	
+				send_ldap_result( conn, op, LDAP_OTHER,
+					NULL, "memory error", 
+					NULL, NULL );
+				goto error_return;
+			}
 			a_flags = (char *)(e_flags + i);
 			memset( a_flags, 0, k );
 			for ( a = e->e_attrs, i=0; a != NULL; a = a->a_next, i++ ) {
@@ -935,7 +968,7 @@ send_search_entry(
 			 * Reuse previous memory - we likely need less space
 			 * for operational attributes
 			 */
-			tmp = ch_realloc ( e_flags, i * sizeof(char *) + k );
+			tmp = SLAP_REALLOC ( e_flags, i * sizeof(char *) + k );
 			if ( tmp == NULL ) {
 #ifdef NEW_LOGGING
 				LDAP_LOG( OPERATION, ERR, 
@@ -1127,8 +1160,9 @@ send_search_entry(
 	}
 
 #ifdef LDAP_CONNECTIONLESS
-	if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2 && rc != -1)
+	if (conn->c_is_udp && op->o_protocol == LDAP_VERSION2 && rc != -1) {
 		rc = ber_printf( ber, "}" );
+	}
 #endif
 	if ( rc == -1 ) {
 #ifdef NEW_LOGGING
@@ -1145,7 +1179,7 @@ send_search_entry(
 		return( 1 );
 	}
 
-	bytes = send_ldap_ber( conn, ber );
+	bytes = op->o_noop ? 0 : send_ldap_ber( conn, ber );
 	ber_free_buf( ber );
 
 	if ( bytes < 0 ) {
@@ -1196,7 +1230,7 @@ send_search_reference(
     BerVarray *v2refs
 )
 {
-	char		berbuf[256];
+	char berbuf[LBER_ELEMENT_SIZEOF];
 	BerElement	*ber = (BerElement *)berbuf;
 	int rc;
 	int bytes;
@@ -1266,7 +1300,8 @@ send_search_reference(
 	if( op->o_protocol < LDAP_VERSION3 ) {
 		/* save the references for the result */
 		if( refs[0].bv_val != NULL ) {
-			value_add( v2refs, refs );
+			if( value_add( v2refs, refs ) )
+				return LDAP_OTHER;
 		}
 		return 0;
 	}
@@ -1301,7 +1336,7 @@ send_search_reference(
 		return -1;
 	}
 
-	bytes = send_ldap_ber( conn, ber );
+	bytes = op->o_noop ? 0 : send_ldap_ber( conn, ber );
 	ber_free_buf( ber );
 
 	ldap_pvt_thread_mutex_lock( &num_sent_mutex );