haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Many callers of uni_forward are not expecting an exception. 

Remove the throw and used a different mechanism to detect non-unicode.
This commit is contained in:
Jeff Young 2020-01-13 15:40:32 +00:00
parent e4eedfa893
commit aeba5c005f
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
common/utf8.cpp
View File

@ -112,13 +112,19 @@ int UTF8::uni_forward( const unsigned char* aSequence, unsigned* aResult )
{ {
default: default:
case 0: case 0:
THROW_IO_ERROR( "invalid start byte" ); if( aResult )
wxFAIL_MSG( "uni_forward: invalid start byte" );
return 0;
break; break;
case 2: case 2:
if( ( s[1] & 0xc0 ) != 0x80 ) if( ( s[1] & 0xc0 ) != 0x80 )
{ {
THROW_IO_ERROR( "invalid continuation byte" ); if( aResult )
wxFAIL_MSG( "uni_forward: invalid continuation byte" );
return 0;
} }
ch = ((s[0] & 0x1f) << 6) + ch = ((s[0] & 0x1f) << 6) +
@ -134,7 +140,10 @@ int UTF8::uni_forward( const unsigned char* aSequence, unsigned* aResult )
// || (s[0] == 0xED && s[1] > 0x9F) // || (s[0] == 0xED && s[1] > 0x9F)
) )
{ {
THROW_IO_ERROR( "invalid continuation byte" ); if( aResult )
wxFAIL_MSG( "uni_forward: invalid continuation byte" );
return 0;
} }
ch = ((s[0] & 0x0f) << 12) + ch = ((s[0] & 0x0f) << 12) +
@ -151,7 +160,10 @@ int UTF8::uni_forward( const unsigned char* aSequence, unsigned* aResult )
(s[0] == 0xF0 && s[1] < 0x90) || (s[0] == 0xF0 && s[1] < 0x90) ||
(s[0] == 0xF4 && s[1] > 0x8F) ) (s[0] == 0xF4 && s[1] > 0x8F) )
{ {
THROW_IO_ERROR( "invalid continuation byte" ); if( aResult )
wxFAIL_MSG( "uni_forward: invalid continuation byte" );
return 0;
} }
ch = ((s[0] & 0x7) << 18) + ch = ((s[0] & 0x7) << 18) +
@ -179,22 +191,20 @@ bool IsUTF8( const char* aString )
const unsigned char* next = (unsigned char*) aString; const unsigned char* next = (unsigned char*) aString;
const unsigned char* end = next + len; const unsigned char* end = next + len;
try
{
while( next < end ) while( next < end )
{ {
next += UTF8::uni_forward( next, NULL ); int charLen = UTF8::uni_forward( next, NULL );
if( charLen == 0 )
return false;
next += charLen;
} }
// uni_forward() should find the exact end if it is truly UTF8 // uni_forward() should find the exact end if it is truly UTF8
if( next > end ) if( next > end )
return false; return false;
} }
catch( const IO_ERROR& )
{
return false;
}
}
return true; return true;
} }