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

Since we (unexpectedly for me) seem to support BLR > 64KB, I'm committing a workaround for CORE-4113 (EXECUTE BLOCK prepare fails). The debug info does not support longish BLR, so don't pretend to find something there beyond the 64KB limit. If someone can think of a better solution, please jump in.

Browse Source
This commit is contained in:
dimitr 2013-06-07 09:51:13 +00:00
parent 220ada8b80
commit 81c4023396
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jrd/par.cpp
View File

@ -2617,7 +2617,7 @@ jrd_nod* PAR_parse_node(thread_db* tdbb, CompilerScratch* csb, USHORT expected)
**************************************/
SET_TDBB(tdbb);
const USHORT blr_offset = csb->csb_blr_reader.getOffset();
const ULONG blr_offset = csb->csb_blr_reader.getOffset();
const SSHORT blr_operator = csb->csb_blr_reader.getByte();
if (blr_operator < 0 || blr_operator >= FB_NELEM(type_table)) {
@ -3418,7 +3418,7 @@ jrd_nod* PAR_parse_node(thread_db* tdbb, CompilerScratch* csb, USHORT expected)
}
size_t pos = 0;
if (csb->csb_dbg_info.blrToSrc.find(blr_offset, pos))
if (blr_offset <= MAX_USHORT && csb->csb_dbg_info.blrToSrc.find(blr_offset, pos))
{
Firebird::MapBlrToSrcItem& i = csb->csb_dbg_info.blrToSrc[pos];
jrd_nod* node_src = PAR_make_node(tdbb, e_src_info_length);