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

Fixed crash when IN predicate is delivered into aggregates/unions

Browse Source
This commit is contained in:
Dmitry Yemanov 2023-09-12 20:33:40 +03:00
parent 66f6030467
commit adbbcc064f
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/jrd/RecordSourceNodes.cpp
View File

@ -3723,7 +3723,11 @@ static void genDeliverUnmapped(CompilerScratch* csb,
children.add(cmpNode->arg2); children.add(cmpNode->arg2);
} }
else if (listNode) else if (listNode)
{
children.add(listNode->arg); children.add(listNode->arg);
for (auto item : listNode->list->items)
children.add(item);
}
else if (missingNode) else if (missingNode)
children.add(missingNode->arg); children.add(missingNode->arg);
else else
@ -3766,7 +3770,7 @@ static void genDeliverUnmapped(CompilerScratch* csb,
newListNode->list = FB_NEW_POOL(pool) ValueListNode(pool, count); newListNode->list = FB_NEW_POOL(pool) ValueListNode(pool, count);
newChildren.add(newListNode->arg.getAddress()); newChildren.add(newListNode->arg.getAddress());
for (auto item : newListNode->list->items) for (auto& item : newListNode->list->items)
newChildren.add(item.getAddress()); newChildren.add(item.getAddress());
deliverNode = newListNode; deliverNode = newListNode;
@ -3819,7 +3823,17 @@ static void genDeliverUnmapped(CompilerScratch* csb,
} }
if (okNode) if (okNode)
deliverStack.push(deliverNode.release()); {
const auto node = deliverNode.release();
if (const auto newListNode = nodeAs<InListBoolNode>(node))
{
newListNode->lookup = FB_NEW_POOL(pool)
LookupValueList(pool, newListNode->list, newListNode->impureOffset);
}
deliverStack.push(node);
}
} }
} }