Mercurial > sdl-ios-xcode
view test/testnative.h @ 3539:f2846bf19360
Fixed bug #896
John Popplewell 2009-12-08 23:05:50 PST
Originally reported by AKFoerster on the mailing list.
Error decoding UTF8 Russian text to UTF-16LE on Windows, but specifically on
platforms without iconv support (the default on Windows).
Valid UTF8 characters are flagged as being overlong and then substituted by the
UNKNOWN_UNICODE character.
After studying the testiconv.c example program, reading the RFCs and putting
some printf statements in SDL_iconv.c the problem is in a test for 'Maximum
overlong sequences', specifically 4.2.1, which is carried out by the following
code:
} else if ( p[0] >= 0xC0 ) {
if ( (p[0] & 0xE0) != 0xC0 ) {
/* Skip illegal sequences
return SDL_ICONV_EILSEQ;
*/
ch = UNKNOWN_UNICODE;
} else {
if ( (p[0] & 0xCE) == 0xC0 ) { <<<<<<<< here
overlong = SDL_TRUE;
}
ch = (Uint32)(p[0] & 0x1F);
left = 1;
}
} else {
Here is the 2-byte encoding of a character in range 00000080 - 000007FF
110xxxxx 10xxxxxx
The line in question is supposed to be checking for an overlong sequence which
would be less than
11000001 10111111
which should be represented as a single byte.
BUT, the mask value (0xCE) is wrong, it isn't checking the top-most bit:
11000001 value
11001110 mask (incorrect)
^
and should be (0xDE):
11000001 value
11011110 mask (correct)
making the above code:
} else if ( p[0] >= 0xC0 ) {
if ( (p[0] & 0xE0) != 0xC0 ) {
/* Skip illegal sequences
return SDL_ICONV_EILSEQ;
*/
ch = UNKNOWN_UNICODE;
} else {
if ( (p[0] & 0xDE) == 0xC0 ) { <<<<<<<< here
overlong = SDL_TRUE;
}
ch = (Uint32)(p[0] & 0x1F);
left = 1;
}
} else {
I can supply a test program and/or a patch if required,
best regards,
John Popplewell
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Fri, 11 Dec 2009 08:03:43 +0000 |
parents | 94dd49f6b005 |
children | e8916fe9cfc8 |
line wrap: on
line source
/* Definitions for platform dependent windowing functions to test SDL integration with native windows */ #include "SDL.h" /* This header includes all the necessary system headers for native windows */ #include "SDL_syswm.h" typedef struct { const char *tag; void *(*CreateNativeWindow) (int w, int h); void (*DestroyNativeWindow) (void *window); } NativeWindowFactory; #ifdef SDL_VIDEO_DRIVER_WIN32 #define TEST_NATIVE_WIN32 extern NativeWindowFactory Win32WindowFactory; #endif #ifdef SDL_VIDEO_DRIVER_X11 #define TEST_NATIVE_X11 extern NativeWindowFactory X11WindowFactory; #endif #ifdef SDL_VIDEO_DRIVER_COCOA /* Actually, we don't really do this, since it involves adding Objective C support to the build system, which is a little tricky. You can uncomment it manually though and link testnativecocoa.m into the test application. */ #if 1 #define TEST_NATIVE_COCOA extern NativeWindowFactory CocoaWindowFactory; #endif #endif