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

Misc.

Browse Source
This commit is contained in:
robocop 2006-08-01 07:42:48 +00:00
parent ad672154c4
commit 083762d55b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jrd/IntlUtil.cpp
View File

@ -85,7 +85,7 @@ bool IntlUtil::parseSpecificAttributes(
// Old attributes will be combined with the new ones. // Old attributes will be combined with the new ones.
const UCHAR* p = s; const UCHAR* p = s;
const UCHAR* end = s + len; const UCHAR* const end = s + len;
ULONG size = 0; ULONG size = 0;
readChar(cs, &p, end, &size); readChar(cs, &p, end, &size);
@ -113,7 +113,8 @@ bool IntlUtil::parseSpecificAttributes(
if (uSize == INTL_BAD_STR_LENGTH) if (uSize == INTL_BAD_STR_LENGTH)
return false; return false;
else if (uSize == 2 &&
if (uSize == 2 &&
((*(USHORT*)uc >= 'A' && *(USHORT*)uc <= 'Z') || ((*(USHORT*)uc >= 'A' && *(USHORT*)uc <= 'Z') ||
(*(USHORT*)uc >= 'a' && *(USHORT*)uc <= 'z') || (*(USHORT*)uc >= 'a' && *(USHORT*)uc <= 'z') ||
*(USHORT*)uc == '-' || *(USHORT*)uc == '_')) *(USHORT*)uc == '-' || *(USHORT*)uc == '_'))
@ -158,7 +159,8 @@ bool IntlUtil::parseSpecificAttributes(
if (uSize == INTL_BAD_STR_LENGTH) if (uSize == INTL_BAD_STR_LENGTH)
return false; return false;
else if (uSize != 2 || *(USHORT*)uc != ';')
if (uSize != 2 || *(USHORT*)uc != ';')
{ {
if (!readChar(cs, &p, end, &size)) if (!readChar(cs, &p, end, &size))
break; break;