--- servers/slapd/overlays/syncprov.c	2007/02/07 01:51:36	1.56.2.42
+++ servers/slapd/overlays/syncprov.c	2007/06/08 07:08:39	1.56.2.43
@@ -1,4 +1,4 @@
-/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.56.2.41 2007/01/25 12:06:09 hyc Exp $ */
+/* $OpenLDAP$ */
 /* syncprov.c - syncrepl provider */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
@@ -2628,8 +2628,8 @@ static int syncprov_parseCtrl (
 	sr->sr_rhint = rhint;
 	if (!BER_BVISNULL(&cookie)) {
 		ber_dupbv_x( &sr->sr_state.octet_str, &cookie, op->o_tmpmemctx );
-		slap_parse_sync_cookie( &sr->sr_state, op->o_tmpmemctx );
-		if ( sr->sr_state.rid == -1 ) {
+		if ( slap_parse_sync_cookie( &sr->sr_state, op->o_tmpmemctx ) ||
+			sr->sr_state.rid == -1 ) {
 			rs->sr_text = "Sync control : cookie parsing error";
 			return LDAP_PROTOCOL_ERROR;
 		}