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
d8eccb35
Commit
d8eccb35
authored
Oct 28, 2013
by
Howard Chu
Browse files
ITS#7733 check cursor index before cursor_del
parent
742a078e
Changes
1
Hide whitespace changes
Inline
Side-by-side
libraries/liblmdb/mdb.c
View file @
d8eccb35
...
...
@@ -5420,8 +5420,9 @@ mdb_cursor_get(MDB_cursor *mc, MDB_val *key, MDB_val *data,
rc
=
EINVAL
;
}
else
{
MDB_page
*
mp
=
mc
->
mc_pg
[
mc
->
mc_top
];
if
(
!
NUMKEYS
(
mp
))
{
mc
->
mc_ki
[
mc
->
mc_top
]
=
0
;
int
nkeys
=
NUMKEYS
(
mp
);
if
(
!
nkeys
||
mc
->
mc_ki
[
mc
->
mc_top
]
>=
nkeys
)
{
mc
->
mc_ki
[
mc
->
mc_top
]
=
nkeys
;
rc
=
MDB_NOTFOUND
;
break
;
}
...
...
@@ -6069,6 +6070,7 @@ int
mdb_cursor_del
(
MDB_cursor
*
mc
,
unsigned
int
flags
)
{
MDB_node
*
leaf
;
MDB_page
*
mp
;
int
rc
;
if
(
mc
->
mc_txn
->
mt_flags
&
(
MDB_TXN_RDONLY
|
MDB_TXN_ERROR
))
...
...
@@ -6077,6 +6079,10 @@ mdb_cursor_del(MDB_cursor *mc, unsigned int flags)
if
(
!
(
mc
->
mc_flags
&
C_INITIALIZED
))
return
EINVAL
;
mp
=
mc
->
mc_pg
[
mc
->
mc_top
];
if
(
mc
->
mc_ki
[
mc
->
mc_top
]
>=
NUMKEYS
(
mp
))
return
MDB_NOTFOUND
;
if
(
!
(
flags
&
MDB_NOSPILL
)
&&
(
rc
=
mdb_page_spill
(
mc
,
NULL
,
NULL
)))
return
rc
;
...
...
@@ -6084,9 +6090,9 @@ mdb_cursor_del(MDB_cursor *mc, unsigned int flags)
if
(
rc
)
return
rc
;
leaf
=
NODEPTR
(
m
c
->
mc_pg
[
mc
->
mc_top
]
,
mc
->
mc_ki
[
mc
->
mc_top
]);
leaf
=
NODEPTR
(
m
p
,
mc
->
mc_ki
[
mc
->
mc_top
]);
if
(
!
IS_LEAF2
(
m
c
->
mc_pg
[
mc
->
mc_top
]
)
&&
F_ISSET
(
leaf
->
mn_flags
,
F_DUPDATA
))
{
if
(
!
IS_LEAF2
(
m
p
)
&&
F_ISSET
(
leaf
->
mn_flags
,
F_DUPDATA
))
{
if
(
!
(
flags
&
MDB_NODUPDATA
))
{
if
(
!
F_ISSET
(
leaf
->
mn_flags
,
F_SUBDATA
))
{
mc
->
mc_xcursor
->
mx_cursor
.
mc_pg
[
0
]
=
NODEDATA
(
leaf
);
...
...
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