From: Howard Chu <hyc@openldap.org>
Date: Thu, 15 Jun 2006 23:54:51 +0000 (+0000)
Subject: ITS#4589 fix slap_compose_sync_cookie
X-Git-Tag: OPENLDAP_REL_ENG_2_4_3ALPHA~9^2~96
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=decba67ee9e89d1dad48aa3a2914f247b2725139;p=openldap

ITS#4589 fix slap_compose_sync_cookie
---

diff --git a/servers/slapd/ldapsync.c b/servers/slapd/ldapsync.c
index 7d9b9cf20e..693bf7c7e3 100644
--- a/servers/slapd/ldapsync.c
+++ b/servers/slapd/ldapsync.c
@@ -38,24 +38,29 @@ slap_compose_sync_cookie(
 	int rid )
 {
 	char cookiestr[ LDAP_LUTIL_CSNSTR_BUFSIZE + 20 ];
+	int len;
 
 	if ( BER_BVISNULL( csn )) {
 		if ( rid == -1 ) {
 			cookiestr[0] = '\0';
+			len = 0;
 		} else {
-			snprintf( cookiestr, LDAP_LUTIL_CSNSTR_BUFSIZE + 20,
+			len = snprintf( cookiestr, LDAP_LUTIL_CSNSTR_BUFSIZE + 20,
 					"rid=%03d", rid );
 		}
 	} else {
-		if ( rid == -1 ) {
-			snprintf( cookiestr, LDAP_LUTIL_CSNSTR_BUFSIZE + 20,
-					"csn=%s", csn->bv_val );
-		} else {
-			snprintf( cookiestr, LDAP_LUTIL_CSNSTR_BUFSIZE + 20,
-					"csn=%s,rid=%03d", csn->bv_val, rid );
+		char *end = cookiestr + sizeof(cookiestr);
+		char *ptr = lutil_strcopy( cookiestr, "csn=" );
+		len = csn->bv_len;
+		if ( ptr + len >= end )
+			len = end - ptr;
+		ptr = lutil_strncopy( ptr, csn->bv_val, len );
+		if ( rid != -1 && ptr < end - STRLENOF(",rid=xxx") ) {
+			ptr += sprintf( ptr, ",rid=%03d", rid );
 		}
+		len = ptr - cookiestr;
 	}
-	ber_str2bv_x( cookiestr, strlen(cookiestr), 1, cookie, 
+	ber_str2bv_x( cookiestr, len, 1, cookie, 
 		op ? op->o_tmpmemctx : NULL );
 }