X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fldap_sync.c;h=b7247a2d7d0dbbc45d03938fe3fc3a43bbea7f01;hb=7164c4c66215da39f03e353a9c72eba408abddbf;hp=da699ff3ee99776e02175ad598f7473a5732664e;hpb=1c85cf3c88f1e3a904b3072f4ef12633af045962;p=openldap

diff --git a/libraries/libldap/ldap_sync.c b/libraries/libldap/ldap_sync.c
index da699ff3ee..b7247a2d7d 100644
--- a/libraries/libldap/ldap_sync.c
+++ b/libraries/libldap/ldap_sync.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2006-2008 The OpenLDAP Foundation.
+ * Copyright 2006-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -128,14 +128,14 @@ static int
 ldap_sync_search_entry( ldap_sync_t *ls, LDAPMessage *res )
 {
 	LDAPControl		**ctrls = NULL;
-	int			rc = LDAP_SUCCESS,
+	int			rc = LDAP_OTHER,
 				i;
 	BerElement		*ber = NULL;
 	struct berval		entryUUID = { 0 },
 				cookie = { 0 };
 	int			state = -1;
 	ber_len_t		len;
-	ldap_sync_refresh_t	phase = ls->ls_refreshPhase;
+	ldap_sync_refresh_t	phase;
 
 #ifdef LDAP_SYNC_TRACE
 	fprintf( stderr, "\tgot LDAP_RES_SEARCH_ENTRY\n" );
@@ -144,6 +144,8 @@ ldap_sync_search_entry( ldap_sync_t *ls, LDAPMessage *res )
 	assert( ls != NULL );
 	assert( res != NULL );
 
+	phase = ls->ls_refreshPhase;
+
 	/* OK */
 
 	/* extract:
@@ -159,7 +161,6 @@ ldap_sync_search_entry( ldap_sync_t *ls, LDAPMessage *res )
 	/* extract controls */
 	ldap_get_entry_controls( ls->ls_ld, res, &ctrls );
 	if ( ctrls == NULL ) {
-		rc = LDAP_OTHER;
 		goto done;
 	}
 
@@ -172,22 +173,26 @@ ldap_sync_search_entry( ldap_sync_t *ls, LDAPMessage *res )
 
 	/* control must be present; there might be other... */
 	if ( ctrls[ i ] == NULL ) {
-		rc = LDAP_OTHER;
 		goto done;
 	}
 
 	/* extract data */
 	ber = ber_init( &ctrls[ i ]->ldctl_value );
+	if ( ber == NULL ) {
+		goto done;
+	}
 	/* scan entryUUID in-place ("m") */
-	ber_scanf( ber, "{em" /*"}"*/, &state, &entryUUID );
-	if ( entryUUID.bv_len == 0 ) {
-		rc = LDAP_OTHER;
+	if ( ber_scanf( ber, "{em" /*"}"*/, &state, &entryUUID ) == LBER_ERROR
+		|| entryUUID.bv_len == 0 )
+	{
 		goto done;
 	}
 
 	if ( ber_peek_tag( ber, &len ) == LDAP_TAG_SYNC_COOKIE ) {
 		/* scan cookie in-place ("m") */
-		ber_scanf( ber, /*"{"*/ "m}", &cookie );
+		if ( ber_scanf( ber, /*"{"*/ "m}", &cookie ) == LBER_ERROR ) {
+			goto done;
+		}
 		if ( cookie.bv_val != NULL ) {
 			ber_bvreplace( &ls->ls_cookie, &cookie );
 		}
@@ -212,16 +217,15 @@ ldap_sync_search_entry( ldap_sync_t *ls, LDAPMessage *res )
 		break;
 
 	default:
-		rc = LDAP_OTHER;
 #ifdef LDAP_SYNC_TRACE
 		fprintf( stderr, "\t\tgot unknown syncState=%d\n", state );
 #endif /* LDAP_SYNC_TRACE */
 		goto done;
 	}
 
-	if ( ls->ls_search_entry ) {
-		rc = ls->ls_search_entry( ls, res, &entryUUID, phase );
-	}
+	rc = ls->ls_search_entry
+		? ls->ls_search_entry( ls, res, &entryUUID, phase )
+		: LDAP_SUCCESS;
 
 done:;
 	if ( ber != NULL ) {
@@ -302,9 +306,10 @@ ldap_sync_search_result( ldap_sync_t *ls, LDAPMessage *res )
 		ber_len_t	len;
 		struct berval	cookie = { 0 };
 
+		rc = LDAP_OTHER;
+
 		/* deal with control; then fallthru to handler */
 		if ( ctrls == NULL ) {
-			rc = LDAP_OTHER;
 			goto done;
 		}
 
@@ -319,16 +324,22 @@ ldap_sync_search_result( ldap_sync_t *ls, LDAPMessage *res )
 
 		/* control must be present; there might be other... */
 		if ( ctrls[ i ] == NULL ) {
-			rc = LDAP_OTHER;
 			goto done;
 		}
 
 		/* extract data */
 		ber = ber_init( &ctrls[ i ]->ldctl_value );
+		if ( ber == NULL ) {
+			goto done;
+		}
 
-		ber_scanf( ber, "{" /*"}"*/);
+		if ( ber_scanf( ber, "{" /*"}"*/) == LBER_ERROR ) {
+			goto ber_done;
+		}
 		if ( ber_peek_tag( ber, &len ) == LDAP_TAG_SYNC_COOKIE ) {
-			ber_scanf( ber, "m", &cookie );
+			if ( ber_scanf( ber, "m", &cookie ) == LBER_ERROR ) {
+				goto ber_done;
+			}
 			if ( cookie.bv_val != NULL ) {
 				ber_bvreplace( &ls->ls_cookie, &cookie );
 			}
@@ -340,17 +351,23 @@ ldap_sync_search_result( ldap_sync_t *ls, LDAPMessage *res )
 
 		refreshDeletes = 0;
 		if ( ber_peek_tag( ber, &len ) == LDAP_TAG_REFRESHDELETES ) {
-			ber_scanf( ber, "b", &refreshDeletes );
+			if ( ber_scanf( ber, "b", &refreshDeletes ) == LBER_ERROR ) {
+				goto ber_done;
+			}
 			if ( refreshDeletes ) {
 				refreshDeletes = 1;
 			}
 		}
 
-		ber_scanf( ber, /*"{"*/ "}" );
+		if ( ber_scanf( ber, /*"{"*/ "}" ) != LBER_ERROR ) {
+			rc = LDAP_SUCCESS;
+		}
 
-		/* NOTE: if any goto/return between ber_init() and here
-		 * is introduced, don't forget to ber_free() */
+	ber_done:;
 		ber_free( ber, 1 );
+		if ( rc != LDAP_SUCCESS ) {
+			break;
+		}
 
 #ifdef LDAP_SYNC_TRACE
 		fprintf( stderr, "\t\tgot refreshDeletes=%s\n",
@@ -379,9 +396,6 @@ ldap_sync_search_result( ldap_sync_t *ls, LDAPMessage *res )
 			err = ls->ls_search_result( ls, res, refreshDeletes );
 		}
 		break;
-
-	default:
-		break;
 	}
 
 done:;
@@ -413,8 +427,7 @@ ldap_sync_search_intermediate( ldap_sync_t *ls, LDAPMessage *res, int *refreshDo
         struct berval		*retdata = NULL;
 	BerElement		*ber = NULL;
 	ber_len_t		len;
-	ber_tag_t		tag,
-				syncinfo_tag;
+	ber_tag_t		syncinfo_tag;
 	struct berval		cookie;
 	int			refreshDeletes = 0;
 	BerVarray		syncUUIDs = NULL;
@@ -444,8 +457,9 @@ ldap_sync_search_intermediate( ldap_sync_t *ls, LDAPMessage *res, int *refreshDo
 		goto done;
 	}
 
+	rc = LDAP_OTHER;
+
 	if ( retoid == NULL || strcmp( retoid, LDAP_SYNC_INFO ) != 0 ) {
-		rc = LDAP_OTHER;
 		goto done;
 	}
 
@@ -458,7 +472,9 @@ ldap_sync_search_intermediate( ldap_sync_t *ls, LDAPMessage *res, int *refreshDo
 	syncinfo_tag = ber_peek_tag( ber, &len );
 	switch ( syncinfo_tag ) {
 	case LDAP_TAG_SYNC_NEW_COOKIE:
-		ber_scanf( ber, "tm", &tag, &cookie );
+		if ( ber_scanf( ber, "m", &cookie ) == LBER_ERROR ) {
+			goto done;
+		}
 		if ( cookie.bv_val != NULL ) {
 			ber_bvreplace( &ls->ls_cookie, &cookie );
 		}
@@ -482,7 +498,6 @@ ldap_sync_search_intermediate( ldap_sync_t *ls, LDAPMessage *res, int *refreshDo
 
 			default:
 				/* TODO: impossible; handle */
-				rc = LDAP_OTHER;
 				goto done;
 			}
 
@@ -497,14 +512,17 @@ ldap_sync_search_intermediate( ldap_sync_t *ls, LDAPMessage *res, int *refreshDo
 
 			default:
 				/* TODO: impossible; handle */
-				rc = LDAP_OTHER;
 				goto done;
 			}
 		}
 
-		ber_scanf( ber, "t{" /*"}"*/, &tag );
+		if ( ber_scanf( ber, "{" /*"}"*/ ) == LBER_ERROR ) {
+			goto done;
+		}
 		if ( ber_peek_tag( ber, &len ) == LDAP_TAG_SYNC_COOKIE ) {
-			ber_scanf( ber, "m", &cookie );
+			if ( ber_scanf( ber, "m", &cookie ) == LBER_ERROR ) {
+				goto done;
+			}
 			if ( cookie.bv_val != NULL ) {
 				ber_bvreplace( &ls->ls_cookie, &cookie );
 			}
@@ -516,7 +534,9 @@ ldap_sync_search_intermediate( ldap_sync_t *ls, LDAPMessage *res, int *refreshDo
 
 		*refreshDone = 1;
 		if ( ber_peek_tag( ber, &len ) == LDAP_TAG_REFRESHDONE ) {
-			ber_scanf( ber, "b", refreshDone );
+			if ( ber_scanf( ber, "b", refreshDone ) == LBER_ERROR ) {
+				goto done;
+			}
 		}
 
 #ifdef LDAP_SYNC_TRACE
@@ -524,7 +544,9 @@ ldap_sync_search_intermediate( ldap_sync_t *ls, LDAPMessage *res, int *refreshDo
 			*refreshDone ? "TRUE" : "FALSE" );
 #endif /* LDAP_SYNC_TRACE */
 
-		ber_scanf( ber, /*"{"*/ "}" );
+		if ( ber_scanf( ber, /*"{"*/ "}" ) == LBER_ERROR ) {
+			goto done;
+		}
 
 		if ( *refreshDone ) {
 			ls->ls_refreshPhase = LDAP_SYNC_CAPI_DONE;
@@ -540,9 +562,13 @@ ldap_sync_search_intermediate( ldap_sync_t *ls, LDAPMessage *res, int *refreshDo
 #ifdef LDAP_SYNC_TRACE
 		fprintf( stderr, "\t\tgot syncIdSet\n" );
 #endif /* LDAP_SYNC_TRACE */
-		ber_scanf( ber, "t{" /*"}"*/, &tag );
+		if ( ber_scanf( ber, "{" /*"}"*/ ) == LBER_ERROR ) {
+			goto done;
+		}
 		if ( ber_peek_tag( ber, &len ) == LDAP_TAG_SYNC_COOKIE ) {
-			ber_scanf( ber, "m", &cookie );
+			if ( ber_scanf( ber, "m", &cookie ) == LBER_ERROR ) {
+				goto done;
+			}
 			if ( cookie.bv_val != NULL ) {
 				ber_bvreplace( &ls->ls_cookie, &cookie );
 			}
@@ -553,13 +579,14 @@ ldap_sync_search_intermediate( ldap_sync_t *ls, LDAPMessage *res, int *refreshDo
 		}
 
 		if ( ber_peek_tag( ber, &len ) == LDAP_TAG_REFRESHDELETES ) {
-			ber_scanf( ber, "b", &refreshDeletes );
+			if ( ber_scanf( ber, "b", &refreshDeletes ) == LBER_ERROR ) {
+				goto done;
+			}
 		}
 
-		ber_scanf( ber, "[W]", &syncUUIDs );
-		ber_scanf( ber, /*"{"*/ "}" );
-		if ( syncUUIDs == NULL ) {
-			rc = LDAP_OTHER;
+		if ( ber_scanf( ber, /*"{"*/ "[W]}", &syncUUIDs ) == LBER_ERROR
+			|| syncUUIDs == NULL )
+		{
 			goto done;
 		}
 
@@ -601,6 +628,8 @@ ldap_sync_search_intermediate( ldap_sync_t *ls, LDAPMessage *res, int *refreshDo
 		goto done;
 	}
 
+	rc = LDAP_SUCCESS;
+
 done:;
 	if ( ber != NULL ) {
 		ber_free( ber, 1 );
@@ -899,4 +928,3 @@ done_search:;
 done:;
 	return rc;
 }
-