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

Postfix for CORE-6358 to avoid error in restore.

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2020-10-09 12:58:16 -03:00
parent 6f979bd775
commit 2f30a82a90
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/jrd/dfw.epp
View File

@ -5927,23 +5927,34 @@ static bool make_version(thread_db* tdbb, SSHORT phase, DeferredWork* work, jrd_
desc.makeText(len, tfb->tfb_desc.getCharSet(), ptr);
}
impure_value tempValue;
MoveBuffer tempBuffer;
if (!tfb->tfb_desc.isBlob() && !DSC_EQUIV(result, &tfb->tfb_desc, false))
{
impure_value tempValue;
tempValue.vlu_desc = tfb->tfb_desc;
MoveBuffer buffer2;
if (tfb->tfb_desc.isText())
tempValue.vlu_desc.dsc_address = buffer2.getBuffer(tfb->tfb_desc.dsc_length);
tempValue.vlu_desc.dsc_address = tempBuffer.getBuffer(tfb->tfb_desc.dsc_length);
else
tempValue.vlu_desc.dsc_address = (UCHAR*) &tempValue.vlu_misc;
MOV_move(tdbb, &desc, &tempValue.vlu_desc);
EVL_make_value(tdbb, &tempValue.vlu_desc, &tfb->tfb_default, relation->rel_pool);
try
{
MOV_move(tdbb, &desc, &tempValue.vlu_desc);
desc = tempValue.vlu_desc;
}
catch (const status_exception&)
{
if (!tdbb->getAttachment()->isGbak())
throw;
// If we're restoring a database, ignore the error and use the original desc.
fb_utils::init_status(tdbb->tdbb_status_vector);
}
}
else
EVL_make_value(tdbb, &desc, &tfb->tfb_default, relation->rel_pool);
EVL_make_value(tdbb, &desc, &tfb->tfb_default, relation->rel_pool);
}
}
catch (const Exception&)