Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joe Martin
OpenLDAP
Commits
98b2910e
Commit
98b2910e
authored
Sep 06, 2017
by
Howard Chu
Committed by
Quanah Gibson-Mount
Feb 11, 2018
Browse files
ITS
#8722
fix FIRST_DUP/LAST_DUP cursor bounds check
parent
26426348
Changes
1
Hide whitespace changes
Inline
Side-by-side
libraries/liblmdb/mdb.c
View file @
98b2910e
...
...
@@ -6426,6 +6426,11 @@ fetchm:
rc
=
MDB_INCOMPATIBLE
;
break
;
}
if
(
mc
->
mc_ki
[
mc
->
mc_top
]
>=
NUMKEYS
(
mc
->
mc_pg
[
mc
->
mc_top
]))
{
mc
->
mc_ki
[
mc
->
mc_top
]
=
NUMKEYS
(
mc
->
mc_pg
[
mc
->
mc_top
]);
rc
=
MDB_NOTFOUND
;
break
;
}
{
MDB_node
*
leaf
=
NODEPTR
(
mc
->
mc_pg
[
mc
->
mc_top
],
mc
->
mc_ki
[
mc
->
mc_top
]);
if
(
!
F_ISSET
(
leaf
->
mn_flags
,
F_DUPDATA
))
{
...
...
@@ -7080,6 +7085,7 @@ mdb_cursor_del(MDB_cursor *mc, unsigned int flags)
if
(
!
(
m2
->
mc_flags
&
C_INITIALIZED
))
continue
;
if
(
m2
->
mc_pg
[
mc
->
mc_top
]
==
mp
)
{
MDB_node
*
n2
=
leaf
;
if
(
m2
->
mc_ki
[
mc
->
mc_top
]
>=
NUMKEYS
(
mp
))
continue
;
if
(
m2
->
mc_ki
[
mc
->
mc_top
]
!=
mc
->
mc_ki
[
mc
->
mc_top
])
{
n2
=
NODEPTR
(
mp
,
m2
->
mc_ki
[
mc
->
mc_top
]);
if
(
n2
->
mn_flags
&
F_SUBDATA
)
continue
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment