From: Will Ballantyne <willb@openldap.org>
Date: Thu, 4 Feb 1999 18:55:58 +0000 (+0000)
Subject: additional checks around derefAlias_r call:
X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~633
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=44c5c210781c2cac940ddfa105d023f021870a74;p=openldap

additional checks around derefAlias_r call:
check for alias problem
check for alias != entry
check for null entry in subsequent switch statement
---

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 35d1889830..bb5383f49b 100644
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -254,28 +254,35 @@ ldbm_back_search(
 					case LDAP_DEREF_ALWAYS:
 						{
 							Entry *newe = derefAlias_r( be, conn, op, e );
-							cache_return_entry_r( &li->li_cache, e );
-							e = newe;
+							if ( newe == NULL ) { /* problem with the alias */
+								cache_return_entry_r( &li->li_cache, e );
+								e = NULL;
+							}
+							else if ( newe != e ) { /* reassign e */
+								cache_return_entry_r( &li->li_cache, e );
+								e = newe;
+							}	
 						}
 						break;
 					}
+					if (e) {
+						switch ( send_search_entry( be, conn, op, e,
+							attrs, attrsonly ) ) {
+						case 0:		/* entry sent ok */
+							nentries++;
+							break;
+						case 1:		/* entry not sent */
+							break;
+						case -1:	/* connection closed */
+							cache_return_entry_r( &li->li_cache, e );
+							idl_free( candidates );
+							free( rbuf );
 
-					switch ( send_search_entry( be, conn, op, e,
-						attrs, attrsonly ) ) {
-					case 0:		/* entry sent ok */
-						nentries++;
-						break;
-					case 1:		/* entry not sent */
-						break;
-					case -1:	/* connection closed */
-						cache_return_entry_r( &li->li_cache, e );
-						idl_free( candidates );
-						free( rbuf );
-
-						if( realBase != NULL) {
-							free( realBase );
+							if( realBase != NULL) {
+								free( realBase );
+							}
+							return( 0 );
 						}
-						return( 0 );
 					}
 				}
 			}