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

Corrections, thanks to Adriano.

Browse Source
This commit is contained in:
dimitr 2011-02-04 07:45:01 +00:00
parent 854f3b54fd
commit 69e6fdd8d3
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/jrd/dfw.epp
View File

@ -4892,7 +4892,16 @@ static Format* make_format(thread_db* tdbb, jrd_rel* relation, USHORT* version,
if (tfb->tfb_flags & TFB_computed) if (tfb->tfb_flags & TFB_computed)
desc->dsc_dtype |= COMPUTED_FLAG; desc->dsc_dtype |= COMPUTED_FLAG;
format->fmt_defaults[tfb->tfb_id] = tfb->tfb_default; impure_value& defRef = format->fmt_defaults[tfb->tfb_id];
defRef = tfb->tfb_default;
if (tfb->tfb_default.vlu_string)
{
fb_assert(defRef.vlu_desc.dsc_dtype == dtype_text);
defRef.vlu_desc.dsc_address = defRef.vlu_string->str_data;
}
else
defRef.vlu_desc.dsc_address = (UCHAR*) &defRef.vlu_misc;
} }
// Compute the offsets of the various fields // Compute the offsets of the various fields
@ -5259,11 +5268,11 @@ static bool make_version(thread_db* tdbb, SSHORT phase, DeferredWork* work, jrd_
if (result) if (result)
{ {
dsc desc = *result; dsc desc = *result;
MoveBuffer buffer;
if (desc.isText() || desc.isBlob()) if (desc.isText() || desc.isBlob())
{ {
UCHAR* ptr = NULL; UCHAR* ptr = NULL;
MoveBuffer buffer;
const int len = MOV_make_string2(tdbb, &desc, CS_NONE, &ptr, buffer, true); const int len = MOV_make_string2(tdbb, &desc, CS_NONE, &ptr, buffer, true);
fb_assert(ULONG(len) < ULONG(MAX_USHORT)); fb_assert(ULONG(len) < ULONG(MAX_USHORT));
desc.makeText(len, ttype_none, ptr); desc.makeText(len, ttype_none, ptr);