From 4821c2c6ed96b31852a06690507af9628d6a067c Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 20 Oct 2003 22:23:11 +0000 Subject: [PATCH] Avoid questionable use of strlen(), strcpy(), and strcat(). --- servers/slapd/syncrepl.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index b13253a943..b786bbe9b7 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -865,11 +865,13 @@ syncrepl_entry( } } - op->ors_filterstr.bv_len = strlen("entryUUID=") + syncUUID->bv_len; - op->ors_filterstr.bv_val = (char *) sl_malloc( op->ors_filterstr.bv_len + 1, - op->o_tmpmemctx ); - strcpy( op->ors_filterstr.bv_val, "entryUUID=" ); - strcat( op->ors_filterstr.bv_val, syncUUID->bv_val ); + op->ors_filterstr.bv_len = (sizeof("entryUUID=")-1) + syncUUID->bv_len; + op->ors_filterstr.bv_val = (char *) sl_malloc( + op->ors_filterstr.bv_len + 1, op->o_tmpmemctx ); + AC_MEMCPY( op->ors_filterstr.bv_val, "entryUUID=", sizeof("entryUUID=")-1 ); + AC_MEMCPY( &op->ors_filterstr.bv_val[sizeof("entryUUID=")-1], + syncUUID->bv_val, syncUUID->bv_len ); + op->ors_filterstr.bv_val[op->ors_filterstr.bv_len] = '\0'; si->e = e; si->syncUUID_ndn = NULL; -- 2.39.5