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

Allowed NONE->charset conversions if called during a comparison.

Browse Source
This commit is contained in:
dimitr 2005-08-22 13:08:49 +00:00
parent 35b8322d94
commit 51b8739acc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/jrd/intl.cpp
View File

@ -926,15 +926,16 @@ ULONG INTL_convert_bytes(thread_db* tdbb,
SET_TDBB(tdbb);
fb_assert(src_ptr != NULL);
fb_assert(src_type != dest_type);
fb_assert(err != NULL);
const UCHAR* const start_dest_ptr = dest_ptr;
if ((dest_type == CS_BINARY) || (dest_type == CS_NONE)) {
if ((dest_type == CS_BINARY) ||
(dest_type == CS_NONE) ||
(src_type == CS_NONE))
{
/* See if we just need a length estimate */
if (dest_ptr == NULL)
return (src_len);