Mercurial > sdl-ios-xcode
view src/loadso/win32/SDL_sysloadso.c @ 4388:1524d3237820 SDL-1.2
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:00:57 +0000 |
parents | 2dc6c9f343c8 |
children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" #ifdef SDL_LOADSO_WIN32 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include "SDL_loadso.h" void *SDL_LoadObject(const char *sofile) { void *handle = NULL; const char *loaderror = "Unknown error"; #if defined(_WIN32_WCE) char errbuf[512]; wchar_t *errbuf_t = SDL_malloc(512 * sizeof(wchar_t)); wchar_t *sofile_t = SDL_malloc((MAX_PATH+1) * sizeof(wchar_t)); MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, sofile, -1, sofile_t, MAX_PATH); handle = (void *)LoadLibrary(sofile_t); /* Generate an error message if all loads failed */ if ( handle == NULL ) { FormatMessage((FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM), NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), errbuf_t, SDL_arraysize(errbuf), NULL); WideCharToMultiByte(CP_ACP, 0, errbuf_t, -1, errbuf, 511, NULL, NULL); loaderror = errbuf; } SDL_free(sofile_t); SDL_free(errbuf_t); #else /*if defined(__WIN32__)*/ char errbuf[512]; handle = (void *)LoadLibrary(sofile); /* Generate an error message if all loads failed */ if ( handle == NULL ) { FormatMessage((FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM), NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), errbuf, SDL_arraysize(errbuf), NULL); loaderror = errbuf; } #endif if ( handle == NULL ) { SDL_SetError("Failed loading %s: %s", sofile, loaderror); } return(handle); } void *SDL_LoadFunction(void *handle, const char *name) { void *symbol = NULL; const char *loaderror = "Unknown error"; #if defined(_WIN32_WCE) char errbuf[512]; int length = SDL_strlen(name); wchar_t *name_t = SDL_malloc((length + 1) * sizeof(wchar_t)); wchar_t *errbuf_t = SDL_malloc(512 * sizeof(wchar_t)); MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, name, -1, name_t, length+1); symbol = (void *)GetProcAddress((HMODULE)handle, name_t); if ( symbol == NULL ) { FormatMessage((FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM), NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), errbuf_t, SDL_arraysize(errbuf), NULL); WideCharToMultiByte(CP_ACP, 0, errbuf_t, -1, errbuf, 511, NULL, NULL); loaderror = errbuf; } SDL_free(name_t); SDL_free(errbuf_t); #else /*if defined(WIN32)*/ char errbuf[512]; symbol = (void *)GetProcAddress((HMODULE)handle, name); if ( symbol == NULL ) { FormatMessage((FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM), NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), errbuf, SDL_arraysize(errbuf), NULL); loaderror = errbuf; } #endif if ( symbol == NULL ) { SDL_SetError("Failed loading %s: %s", name, loaderror); } return(symbol); } void SDL_UnloadObject(void *handle) { if ( handle != NULL ) { FreeLibrary((HMODULE)handle); } } #endif /* SDL_LOADSO_WIN32 */