generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-11-26 00:40:05 +01:00
Code Issues Projects Releases Wiki Activity

sync to internal repository

Browse Source
This commit is contained in:
Guenter Obiltschnig
2007-02-23 14:27:57 +00:00
parent 973e256680
commit 7639f5a3f0
742 changed files with 865 additions and 795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Foundation/src/UTF16Encoding.cpp
View File

@@ -1,7 +1,7 @@
//
// UTF16Encoding.cpp
//
// $Id: //poco/1.3/Foundation/src/UTF16Encoding.cpp#1 $
// $Id: //poco/Main/Foundation/src/UTF16Encoding.cpp#12 $
//
// Library: Foundation
// Package: Text
@@ -125,7 +125,7 @@ int UTF16Encoding::convert(int ch, unsigned char* bytes, int length) const
{
if (ch <= 0xFFFF)
{
if (length >= 2)
if (bytes && length >= 2)
{
UInt16 ch1 = _flipBytes ? ByteOrder::flipBytes((UInt16) ch) : (UInt16) ch;
unsigned char* p = (unsigned char*) &ch1;
@@ -136,7 +136,7 @@ int UTF16Encoding::convert(int ch, unsigned char* bytes, int length) const
}
else
{
if (length >= 4)
if (bytes && length >= 4)
{
int ch1 = ch - 0x10000;
UInt16 w1 = 0xD800 + ((ch1 >> 10) & 0x3FF);