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

Fixed CORE-1694 - Bug in create/alter Database trigger (with Russian comment)

Browse Source
This commit is contained in:
asfernandes 2008-01-19 00:06:08 +00:00
parent 2510edf299
commit b11f60b216
1 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/jrd/filters.cpp
View File

@ -650,6 +650,7 @@ ISC_STATUS filter_transliterate_text(USHORT action, BlobControl* control)
**************************************/ **************************************/
struct ctlaux { struct ctlaux {
CsConvert ctlaux_obj1; /* Intl object that does tx for us */ CsConvert ctlaux_obj1; /* Intl object that does tx for us */
USHORT ctlaux_init_action; // isc_blob_filter_open or isc_blob_filter_create?
BYTE *ctlaux_buffer1; /* Temporary buffer for transliteration */ BYTE *ctlaux_buffer1; /* Temporary buffer for transliteration */
BlobControl* ctlaux_subfilter; /* For chaining transliterate filters */ BlobControl* ctlaux_subfilter; /* For chaining transliterate filters */
ISC_STATUS ctlaux_source_blob_status; /* marks when source is EOF, etc */ ISC_STATUS ctlaux_source_blob_status; /* marks when source is EOF, etc */
@ -695,6 +696,7 @@ ISC_STATUS filter_transliterate_text(USHORT action, BlobControl* control)
#endif #endif
control->ctl_data[0] = (IPTR) aux; control->ctl_data[0] = (IPTR) aux;
aux->ctlaux_init_action = action;
aux->ctlaux_source_blob_status = FB_SUCCESS; aux->ctlaux_source_blob_status = FB_SUCCESS;
aux->ctlaux_buffer1_unused = 0; aux->ctlaux_buffer1_unused = 0;
aux->ctlaux_expansion_factor = EXP_SCALE * 1; aux->ctlaux_expansion_factor = EXP_SCALE * 1;
@ -766,16 +768,26 @@ ISC_STATUS filter_transliterate_text(USHORT action, BlobControl* control)
return FB_SUCCESS; return FB_SUCCESS;
case isc_blob_filter_close: case isc_blob_filter_close:
// ASF: Raise error at close functions is something bad,
// but I know no better thing to do here.
if (aux->ctlaux_init_action == isc_blob_filter_create &&
aux->ctlaux_buffer1_unused != 0)
{
return isc_transliteration_failed;
}
if (aux && aux->ctlaux_buffer1) { if (aux && aux->ctlaux_buffer1) {
gds__free(aux->ctlaux_buffer1); gds__free(aux->ctlaux_buffer1);
aux->ctlaux_buffer1 = NULL; aux->ctlaux_buffer1 = NULL;
aux->ctlaux_buffer1_len = 0; aux->ctlaux_buffer1_len = 0;
} }
if (aux) { if (aux) {
gds__free(aux); gds__free(aux);
control->ctl_data[0] = 0; control->ctl_data[0] = 0;
aux = NULL; aux = NULL;
} }
return FB_SUCCESS; return FB_SUCCESS;
case isc_blob_filter_get_segment: case isc_blob_filter_get_segment:
@ -783,10 +795,25 @@ ISC_STATUS filter_transliterate_text(USHORT action, BlobControl* control)
break; break;
case isc_blob_filter_put_segment: case isc_blob_filter_put_segment:
{
USHORT len = control->ctl_buffer_length;
Firebird::HalfStaticArray<BYTE, BUFFER_MEDIUM> buffer;
BYTE* p;
if (aux->ctlaux_buffer1_unused != 0)
{
p = buffer.getBuffer(aux->ctlaux_buffer1_unused + len);
memcpy(p, aux->ctlaux_buffer1, aux->ctlaux_buffer1_unused);
memcpy(p + aux->ctlaux_buffer1_unused, control->ctl_buffer, len);
len += aux->ctlaux_buffer1_unused;
}
else
p = control->ctl_buffer;
/* Now convert from the input buffer into the temporary buffer */ /* Now convert from the input buffer into the temporary buffer */
/* How much space do we need to convert? */ /* How much space do we need to convert? */
result_length = aux->ctlaux_obj1.convertLength(control->ctl_buffer_length); result_length = aux->ctlaux_obj1.convertLength(len);
/* Allocate a new buffer if we don't have enough */ /* Allocate a new buffer if we don't have enough */
if (result_length > aux->ctlaux_buffer1_len) { if (result_length > aux->ctlaux_buffer1_len) {
@ -802,14 +829,18 @@ ISC_STATUS filter_transliterate_text(USHORT action, BlobControl* control)
try try
{ {
result_length = aux->ctlaux_obj1.convert(control->ctl_buffer_length, control->ctl_buffer, err_position = len;
aux->ctlaux_buffer1_len, aux->ctlaux_buffer1); result_length = aux->ctlaux_obj1.convert(len, p,
aux->ctlaux_buffer1_len, aux->ctlaux_buffer1, &err_position);
} }
catch (const Firebird::status_exception&) catch (const Firebird::status_exception&)
{ {
return isc_transliteration_failed; return isc_transliteration_failed;
} }
if (len > 0 && err_position == 0)
return isc_transliteration_failed;
/* hand the text off to the next stage of the filter */ /* hand the text off to the next stage of the filter */
status = caller(isc_blob_filter_put_segment, control, result_length, status = caller(isc_blob_filter_put_segment, control, result_length,
@ -818,6 +849,11 @@ ISC_STATUS filter_transliterate_text(USHORT action, BlobControl* control)
if (status) if (status)
return status; return status;
aux->ctlaux_buffer1_unused = len - err_position;
if (aux->ctlaux_buffer1_unused != 0)
memmove(aux->ctlaux_buffer1, p + err_position, aux->ctlaux_buffer1_unused);
/* update local control variables for segment length */ /* update local control variables for segment length */
if (result_length > control->ctl_max_segment) if (result_length > control->ctl_max_segment)
@ -827,6 +863,7 @@ ISC_STATUS filter_transliterate_text(USHORT action, BlobControl* control)
control->ctl_number_segments++; control->ctl_number_segments++;
return FB_SUCCESS; return FB_SUCCESS;
}
case isc_blob_filter_seek: case isc_blob_filter_seek:
return isc_uns_ext; return isc_uns_ext;