From 74785632c7b97befd098525d36431a537f8b0b99 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Tue, 27 Jan 2015 23:38:32 +0000
Subject: [PATCH] ITS#8036 more for prev commit

---
 servers/slapd/back-mdb/search.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/servers/slapd/back-mdb/search.c b/servers/slapd/back-mdb/search.c
index 352ca69d53..39d2b28b7c 100644
--- a/servers/slapd/back-mdb/search.c
+++ b/servers/slapd/back-mdb/search.c
@@ -371,6 +371,8 @@ mdb_waitfixup( Operation *op, ww_ctx *ww, MDB_cursor *mci, MDB_cursor *mcd, ID2
 		int i;
 		key.mv_size = sizeof(ID);
 		for ( i=1; i<scopes[0].mid; i++ ) {
+			if ( !scopes[i].mval.mv_size )
+				continue;
 			key.mv_data = &scopes[i].mid;
 			mdb_cursor_get( mcd, &key, &scopes[i].mval, MDB_SET );
 		}
-- 
2.39.5