mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-31 03:00:05 +00:00
Code Activity

Fixes for CharPointer_UTF8::isValidString()

Browse source
This commit is contained in:
jules 2012-08-20 09:36:18 +01:00
parent 386cb19ddd
commit 6e31e8babc
2 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
modules/juce_core/text/juce_CharPointer_UTF8.h
View file

@ -516,34 +516,33 @@ public:
{
while (--maxBytesToRead >= 0 && *dataToTest != 0)
{
const signed char byte = (signed char) *dataToTest;
const signed char byte = (signed char) *dataToTest++;
if (byte < 0)
{
uint32 n = (uint32) (uint8) byte;
uint32 mask = 0x7f;
uint32 bit = 0x40;
uint8 bit = 0x40;
int numExtraValues = 0;
while ((n & bit) != 0)
while ((byte & bit) != 0)
{
if (bit <= 0x10)
if (bit < 8)
return false;
mask >>= 1;
++numExtraValues;
bit >>= 1;
}
n &= mask;
while (--numExtraValues >= 0)
{
const uint32 nextByte = (uint32) (uint8) *dataToTest++;
if ((nextByte & 0xc0) != 0x80)
if (bit == 8 && (numExtraValues > maxBytesToRead
|| *CharPointer_UTF8 (dataToTest - 1) > 0x10ffff))
return false;
}
maxBytesToRead -= numExtraValues;
if (maxBytesToRead < 0)
return false;
while (--numExtraValues >= 0)
if ((*dataToTest++ & 0xc0) != 0x80)
return false;
}
}

2
modules/juce_core/text/juce_String.cpp
View file

@ -2098,6 +2098,8 @@ public:
memset (buffer, 0xff, sizeof (buffer));
CharPointerType (buffer).writeAll (s.toUTF8());
test.expectEquals (String (CharPointerType (buffer)), s);
test.expect (CharPointerType::isValidString (buffer, strlen ((const char*) buffer)));
}
};