Skip to content

Fix isc_put_slice storing unaligned VARCHAR array elements without character set conversion #9181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
madorin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix isc_put_slice storing unaligned VARCHAR array elements without character set conversion #9181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions src/jrd/blb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2911,23 +2911,21 @@ static void slice_callback(array_slice* arg, ULONG /*count*/, DSC* descriptors)

// The individual elements of a varying string array may not be aligned
// correctly. If they aren't, some RISC machines may break. In those
// cases, calculate the actual length and then move the length and text manually.
// cases, move the value into an aligned temporary and then copy the length and text.
// Don't use MOV_make_string here, it doesn't transliterate between character sets.

if (array_desc->dsc_dtype == dtype_varying &&
array_desc->dsc_address !=
FB_ALIGN(array_desc->dsc_address, (MIN(sizeof(USHORT), FB_ALIGNMENT))))
{
// Note: cannot remove this JRD_get_thread_data without api change
// to slice callback routines
/*thread_db* tdbb = */ JRD_get_thread_data();

DynamicVaryStr<1024> tmp_buffer;
const USHORT tmp_len = array_desc->dsc_length;
const char* p;
const USHORT len = MOV_make_string(tdbb, slice_desc, array_desc->getTextType(), &p,
tmp_buffer.getBuffer(tmp_len), tmp_len);
memcpy(array_desc->dsc_address, &len, sizeof(USHORT));
memcpy(array_desc->dsc_address + sizeof(USHORT), p, (int) len);
vary* const tmp = tmp_buffer.getBuffer(array_desc->dsc_length);

dsc tmp_desc = *array_desc;
tmp_desc.dsc_address = reinterpret_cast<UCHAR*>(tmp);
MOV_move(tdbb, slice_desc, &tmp_desc);

memcpy(array_desc->dsc_address, tmp, sizeof(USHORT) + tmp->vary_length);
}
else
{
Expand Down