Commit 7a90776b authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

ITS#7473 fix b1a6f698

uninit'd size in dn2id_walk, bogus pagedresults
parent fef2a151
...@@ -835,6 +835,7 @@ mdb_dn2id_walk( ...@@ -835,6 +835,7 @@ mdb_dn2id_walk(
key.mv_data = &isc->scopes[n].mid; key.mv_data = &isc->scopes[n].mid;
key.mv_size = sizeof(ID); key.mv_size = sizeof(ID);
data.mv_data = isc->nrdns[n].bv_val - 2; data.mv_data = isc->nrdns[n].bv_val - 2;
data.mv_size = 1; /* just needs to be non-zero, mdb_dup_compare doesn't care */
mdb_cursor_get( isc->mc, &key, &data, MDB_GET_BOTH ); mdb_cursor_get( isc->mc, &key, &data, MDB_GET_BOTH );
continue; continue;
} }
......
...@@ -630,6 +630,7 @@ dn2entry_retry: ...@@ -630,6 +630,7 @@ dn2entry_retry:
} }
if ( id == (ID)ps->ps_cookie ) if ( id == (ID)ps->ps_cookie )
id = mdb_idl_next( candidates, &cursor ); id = mdb_idl_next( candidates, &cursor );
nsubs = ncand; /* always bypass scope'd search */
goto loop_begin; goto loop_begin;
} }
if ( nsubs < ncand ) { if ( nsubs < ncand ) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment