Skip to content

Commit e4b433a

Browse files
committed
Change logic to make clear stack cannot be NULL
1 parent e79b9c0 commit e4b433a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/jrd/vio.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7295,6 +7295,9 @@ void VIO_update_in_place(thread_db* tdbb,
72957295
{
72967296
stack = &org_rpb->rpb_record->getPrecedence();
72977297
}
7298+
// According to DS on firebird-devel: it is not possible update non-existing record so stack is
7299+
// unavoidable assigned to some value
7300+
fb_assert(stack);
72987301

72997302
Record* const old_data = org_rpb->rpb_record;
73007303

@@ -7327,11 +7330,8 @@ void VIO_update_in_place(thread_db* tdbb,
73277330
temp2.rpb_number = org_rpb->rpb_number;
73287331
DPM_store(tdbb, &temp2, *stack, DPM_secondary);
73297332

7330-
if (stack)
7331-
{
7332-
const USHORT pageSpaceID = temp2.getWindow(tdbb).win_page.getPageSpaceID();
7333-
stack->push(PageNumber(pageSpaceID, temp2.rpb_page));
7334-
}
7333+
const USHORT pageSpaceID = temp2.getWindow(tdbb).win_page.getPageSpaceID();
7334+
stack->push(PageNumber(pageSpaceID, temp2.rpb_page));
73357335
}
73367336

73377337
if (!DPM_get(tdbb, org_rpb, LCK_write))

0 commit comments

Comments
 (0)