Mercurial > sdl-ios-xcode
view src/events/SDL_active.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 | 052dc40d917f |
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" /* Application focus/iconification handling code for SDL */ #include "SDL_events.h" #include "SDL_events_c.h" /* These are static for our active event handling code */ static Uint8 SDL_appstate = 0; /* Public functions */ int SDL_AppActiveInit(void) { /* Start completely active */ SDL_appstate = (SDL_APPACTIVE|SDL_APPINPUTFOCUS|SDL_APPMOUSEFOCUS); /* That's it! */ return(0); } void SDL_AppActiveQuit(void) { } Uint8 SDL_GetAppState(void) { return(SDL_appstate); } /* This is global for SDL_eventloop.c */ int SDL_PrivateAppActive(Uint8 gain, Uint8 state) { int posted; Uint8 new_state; /* Modify the current state with the given mask */ if ( gain ) { new_state = (SDL_appstate | state); } else { new_state = (SDL_appstate & ~state); } /* Drop events that don't change state */ if ( new_state == SDL_appstate ) { return(0); } /* Update internal active state */ SDL_appstate = new_state; /* Post the event, if desired */ posted = 0; if ( SDL_ProcessEvents[SDL_ACTIVEEVENT] == SDL_ENABLE ) { SDL_Event event; SDL_memset(&event, 0, sizeof(event)); event.type = SDL_ACTIVEEVENT; event.active.gain = gain; event.active.state = state; if ( (SDL_EventOK == NULL) || (*SDL_EventOK)(&event) ) { posted = 1; SDL_PushEvent(&event); } } /* If we lost keyboard focus, post key-up events */ if ( (state & SDL_APPINPUTFOCUS) && !gain ) { SDL_ResetKeyboard(); } /* If we were minimized, post button-up events */ if ( (state & SDL_APPACTIVE) && !gain ) { SDL_ResetMouse(); } return(posted); }