Mercurial > sdl-ios-xcode
view src/thread/symbian/SDL_syssem.cpp @ 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 | a1b03ba2fcd0 |
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 Library General Public License as published by the Free Software Foundation; either version 2 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@devolution.com */ /* SDL_syssem.cpp Epoc version by Markus Mertama (w@iki.fi) */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id: SDL_syssem.c,v 1.1.2.4 2000/06/22 15:24:48 hercules Exp $"; #endif /* Semaphore functions using the Win32 API */ //#include <stdio.h> //#include <stdlib.h> #include <e32std.h> #include "SDL_error.h" #include "SDL_thread.h" #define SDL_MUTEX_TIMEOUT -2 struct SDL_semaphore { TInt handle; TInt count; }; extern TInt CreateUnique(TInt (*aFunc)(const TDesC& aName, TAny*, TAny*), TAny*, TAny*); #ifndef EKA2 extern TInt NewThread(const TDesC& aName, TAny* aPtr1, TAny* aPtr2); #endif TInt NewSema(const TDesC& aName, TAny* aPtr1, TAny* aPtr2) { TInt value = *((TInt*) aPtr2); return ((RSemaphore*)aPtr1)->CreateGlobal(aName, value); } /* Create a semaphore */ SDL_sem *SDL_CreateSemaphore(Uint32 initial_value) { RSemaphore s; TInt status = CreateUnique(NewSema, &s, &initial_value); if(status != KErrNone) { SDL_SetError("Couldn't create semaphore"); } SDL_semaphore* sem = new /*(ELeave)*/ SDL_semaphore; sem->handle = s.Handle(); sem->count = initial_value; return(sem); } /* Free the semaphore */ void SDL_DestroySemaphore(SDL_sem *sem) { if ( sem ) { RSemaphore sema; sema.SetHandle(sem->handle); while(--sem->count) sema.Signal(); sema.Close(); delete sem; sem = NULL; } } #ifndef EKA2 struct TInfo { TInfo(TInt aTime, TInt aHandle) : iTime(aTime), iHandle(aHandle), iVal(0) {} TInt iTime; TInt iHandle; TInt iVal; }; TBool ThreadRun(TAny* aInfo) { TInfo* info = STATIC_CAST(TInfo*, aInfo); User::After(info->iTime); RSemaphore sema; sema.SetHandle(info->iHandle); sema.Signal(); info->iVal = SDL_MUTEX_TIMEOUT; return 0; } #endif void _WaitAll(SDL_sem *sem) { //since SemTryWait may changed the counter. //this may not be atomic, but hopes it works. RSemaphore sema; sema.SetHandle(sem->handle); sema.Wait(); while(sem->count < 0) { sema.Wait(); } } int SDL_SemWaitTimeout(SDL_sem *sem, Uint32 timeout) { if ( ! sem ) { SDL_SetError("Passed a NULL sem"); return -1; } if ( timeout == SDL_MUTEX_MAXWAIT ) { _WaitAll(sem); return SDL_MUTEX_MAXWAIT; } #ifdef EKA2 RSemaphore sema; sema.SetHandle(sem->handle); if(KErrNone == sema.Wait(timeout)) return 0; return -1; #else RThread thread; TInfo* info = new (ELeave)TInfo(timeout, sem->handle); TInt status = CreateUnique(NewThread, &thread, info); if(status != KErrNone) return status; thread.Resume(); _WaitAll(sem); if(thread.ExitType() == EExitPending) { thread.Kill(SDL_MUTEX_TIMEOUT); } thread.Close(); return info->iVal; #endif } int SDL_SemTryWait(SDL_sem *sem) { if(sem->count > 0) { sem->count--; } return SDL_MUTEX_TIMEOUT; } int SDL_SemWait(SDL_sem *sem) { return SDL_SemWaitTimeout(sem, SDL_MUTEX_MAXWAIT); } /* Returns the current count of the semaphore */ Uint32 SDL_SemValue(SDL_sem *sem) { if ( ! sem ) { SDL_SetError("Passed a NULL sem"); return 0; } return sem->count; } int SDL_SemPost(SDL_sem *sem) { if ( ! sem ) { SDL_SetError("Passed a NULL sem"); return -1; } sem->count++; RSemaphore sema; sema.SetHandle(sem->handle); sema.Signal(); return 0; }