From: Howard Chu <hyc@openldap.org>
Date: Sat, 25 Jul 2009 00:09:56 +0000 (+0000)
Subject: More cleanup
X-Git-Tag: ACLCHECK_0~401
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=addb1320a46df16691253f7c4562e8176cd74e75;p=openldap

More cleanup
---

diff --git a/servers/slapd/overlays/sssvlv.c b/servers/slapd/overlays/sssvlv.c
index 4db21d3b3b..8dccdab02c 100644
--- a/servers/slapd/overlays/sssvlv.c
+++ b/servers/slapd/overlays/sssvlv.c
@@ -34,6 +34,8 @@
 #include "lutil.h"
 #include "config.h"
 
+#include "../../../libraries/liblber/lber-int.h"	/* ber_rewind */
+
 /* RFC2891: Server Side Sorting
  * RFC2696: Paged Results
  */
@@ -76,7 +78,7 @@ typedef struct sort_key
 
 typedef struct sort_ctrl {
 	int sc_nkeys;
-	sort_key sc_keys[0];
+	sort_key sc_keys[1];
 } sort_ctrl;
 
 
@@ -1000,7 +1002,7 @@ static int sss_parseCtrl(
 	i = count_key( ber );
 
 	sc = op->o_tmpalloc( sizeof(sort_ctrl) +
-		i * sizeof(sort_key), op->o_tmpmemctx );
+		(i-1) * sizeof(sort_key), op->o_tmpmemctx );
 	sc->sc_nkeys = i;
 	op->o_controls[sss_cid] = sc;