firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 14:03:07 +01:00
Code Issues

Never rely on eof/bof markers for non-scrollable-cursors code.

Browse Source 
This fixes the newly introduced bug as well as the original issue.
This commit is contained in:
dimitr 2005-12-26 09:47:37 +00:00
parent dc971b995f
commit 37cdbf2e17
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/jrd/nav.cpp
View File

@ -498,15 +498,6 @@ bool NAV_get_record(thread_db* tdbb,
} }
#endif #endif
// If we alredy reached end of the stream, return
if ((direction == RSE_get_forward &&
impure->irsb_flags & irsb_eof) ||
(direction == RSE_get_backward &&
impure->irsb_flags & irsb_bof))
{
return false;
}
init_fetch(impure); init_fetch(impure);
index_desc* idx = (index_desc*) ((SCHAR*) impure + (IPTR) rsb->rsb_arg[RSB_NAV_idx_offset]); index_desc* idx = (index_desc*) ((SCHAR*) impure + (IPTR) rsb->rsb_arg[RSB_NAV_idx_offset]);
@ -630,7 +621,9 @@ bool NAV_get_record(thread_db* tdbb,
#endif #endif
{ {
if (node.isEndLevel) { if (node.isEndLevel) {
#ifdef SCROLLABLE_CURSORS
impure->irsb_flags |= irsb_eof; impure->irsb_flags |= irsb_eof;
#endif
break; break;
} }
if (node.isEndBucket) { if (node.isEndBucket) {
@ -1478,7 +1471,11 @@ static UCHAR* get_position(
SET_TDBB(tdbb); SET_TDBB(tdbb);
// If this is the first time, start at the beginning (or the end) // If this is the first time, start at the beginning (or the end)
#ifdef SCROLLABLE_CURSORS
if (!window->win_page || impure->irsb_flags & (irsb_bof | irsb_eof)) { if (!window->win_page || impure->irsb_flags & (irsb_bof | irsb_eof)) {
#else
if (!window->win_page) {
#endif
return nav_open(tdbb, rsb, impure, window, direction, expanded_node); return nav_open(tdbb, rsb, impure, window, direction, expanded_node);
} }
@ -1617,11 +1614,13 @@ static bool get_record(
tdbb->tdbb_attachment->att_flags |= ATT_no_cleanup; // HACK tdbb->tdbb_attachment->att_flags |= ATT_no_cleanup; // HACK
} }
#ifdef SCROLLABLE_CURSORS
// the attempt to get a record, whether successful or not, takes // the attempt to get a record, whether successful or not, takes
// us off bof or eof (otherwise we will keep trying to retrieve // us off bof or eof (otherwise we will keep trying to retrieve
// the first record) // the first record)
impure->irsb_flags &= ~(irsb_bof | irsb_eof); impure->irsb_flags &= ~(irsb_bof | irsb_eof);
#endif
result = result =
VIO_get(tdbb, VIO_get(tdbb,
@ -1715,12 +1714,14 @@ static UCHAR* nav_open(
impure->irsb_nav_page = 0; impure->irsb_nav_page = 0;
impure->irsb_nav_length = 0; impure->irsb_nav_length = 0;
#ifdef SCROLLABLE_CURSORS
if (direction == RSE_get_forward) { if (direction == RSE_get_forward) {
impure->irsb_flags |= irsb_bof; impure->irsb_flags |= irsb_bof;
} }
else if (direction == RSE_get_backward) { else if (direction == RSE_get_backward) {
impure->irsb_flags |= irsb_eof; impure->irsb_flags |= irsb_eof;
} }
#endif
// Find the starting leaf page // Find the starting leaf page
jrd_nod* retrieval_node = (jrd_nod*) rsb->rsb_arg[RSB_NAV_index]; jrd_nod* retrieval_node = (jrd_nod*) rsb->rsb_arg[RSB_NAV_index];