Mercurial > sdl-ios-xcode
view src/audio/dummy/SDL_dummyaudio.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 | 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 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 This file written by Ryan C. Gordon (icculus@icculus.org) */ #include "SDL_config.h" /* Output audio to nowhere... */ #include "SDL_rwops.h" #include "SDL_timer.h" #include "SDL_audio.h" #include "../SDL_audiomem.h" #include "../SDL_audio_c.h" #include "../SDL_audiodev_c.h" #include "SDL_dummyaudio.h" /* The tag name used by DUMMY audio */ #define DUMMYAUD_DRIVER_NAME "dummy" /* Audio driver functions */ static int DUMMYAUD_OpenAudio(_THIS, SDL_AudioSpec *spec); static void DUMMYAUD_WaitAudio(_THIS); static void DUMMYAUD_PlayAudio(_THIS); static Uint8 *DUMMYAUD_GetAudioBuf(_THIS); static void DUMMYAUD_CloseAudio(_THIS); /* Audio driver bootstrap functions */ static int DUMMYAUD_Available(void) { const char *envr = SDL_getenv("SDL_AUDIODRIVER"); if (envr && (SDL_strcmp(envr, DUMMYAUD_DRIVER_NAME) == 0)) { return(1); } return(0); } static void DUMMYAUD_DeleteDevice(SDL_AudioDevice *device) { SDL_free(device->hidden); SDL_free(device); } static SDL_AudioDevice *DUMMYAUD_CreateDevice(int devindex) { SDL_AudioDevice *this; /* Initialize all variables that we clean on shutdown */ this = (SDL_AudioDevice *)SDL_malloc(sizeof(SDL_AudioDevice)); if ( this ) { SDL_memset(this, 0, (sizeof *this)); this->hidden = (struct SDL_PrivateAudioData *) SDL_malloc((sizeof *this->hidden)); } if ( (this == NULL) || (this->hidden == NULL) ) { SDL_OutOfMemory(); if ( this ) { SDL_free(this); } return(0); } SDL_memset(this->hidden, 0, (sizeof *this->hidden)); /* Set the function pointers */ this->OpenAudio = DUMMYAUD_OpenAudio; this->WaitAudio = DUMMYAUD_WaitAudio; this->PlayAudio = DUMMYAUD_PlayAudio; this->GetAudioBuf = DUMMYAUD_GetAudioBuf; this->CloseAudio = DUMMYAUD_CloseAudio; this->free = DUMMYAUD_DeleteDevice; return this; } AudioBootStrap DUMMYAUD_bootstrap = { DUMMYAUD_DRIVER_NAME, "SDL dummy audio driver", DUMMYAUD_Available, DUMMYAUD_CreateDevice }; /* This function waits until it is possible to write a full sound buffer */ static void DUMMYAUD_WaitAudio(_THIS) { /* Don't block on first calls to simulate initial fragment filling. */ if (this->hidden->initial_calls) this->hidden->initial_calls--; else SDL_Delay(this->hidden->write_delay); } static void DUMMYAUD_PlayAudio(_THIS) { /* no-op...this is a null driver. */ } static Uint8 *DUMMYAUD_GetAudioBuf(_THIS) { return(this->hidden->mixbuf); } static void DUMMYAUD_CloseAudio(_THIS) { if ( this->hidden->mixbuf != NULL ) { SDL_FreeAudioMem(this->hidden->mixbuf); this->hidden->mixbuf = NULL; } } static int DUMMYAUD_OpenAudio(_THIS, SDL_AudioSpec *spec) { float bytes_per_sec = 0.0f; /* Allocate mixing buffer */ this->hidden->mixlen = spec->size; this->hidden->mixbuf = (Uint8 *) SDL_AllocAudioMem(this->hidden->mixlen); if ( this->hidden->mixbuf == NULL ) { return(-1); } SDL_memset(this->hidden->mixbuf, spec->silence, spec->size); bytes_per_sec = (float) (((spec->format & 0xFF) / 8) * spec->channels * spec->freq); /* * We try to make this request more audio at the correct rate for * a given audio spec, so timing stays fairly faithful. * Also, we have it not block at all for the first two calls, so * it seems like we're filling two audio fragments right out of the * gate, like other SDL drivers tend to do. */ this->hidden->initial_calls = 2; this->hidden->write_delay = (Uint32) ((((float) spec->size) / bytes_per_sec) * 1000.0f); /* We're ready to rock and roll. :-) */ return(0); }