annotate include/SDL_config.h.default @ 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
rev   line source
1603
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
1 /*
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
2 SDL - Simple DirectMedia Layer
4159
a1b03ba2fcd0 Updated copyright date
Sam Lantinga <slouken@libsdl.org>
parents: 3975
diff changeset
3 Copyright (C) 1997-2009 Sam Lantinga
1603
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
4
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
5 This library is free software; you can redistribute it and/or
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
6 modify it under the terms of the GNU Lesser General Public
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
7 License as published by the Free Software Foundation; either
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
8 version 2.1 of the License, or (at your option) any later version.
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
9
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
10 This library is distributed in the hope that it will be useful,
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
13 Lesser General Public License for more details.
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
14
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
15 You should have received a copy of the GNU Lesser General Public
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
16 License along with this library; if not, write to the Free Software
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
18
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
19 Sam Lantinga
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
20 slouken@libsdl.org
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
21 */
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
22
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
23 #ifndef _SDL_config_h
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
24 #define _SDL_config_h
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
25
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
26 #include "SDL_platform.h"
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
27
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
28 /* Add any platform that doesn't build using the configure system */
3888
6d2e1961661a Removed broken AmigaOS support.
Ryan C. Gordon <icculus@icculus.org>
parents: 1603
diff changeset
29 #if defined(__DREAMCAST__)
1603
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
30 #include "SDL_config_dreamcast.h"
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
31 #elif defined(__MACOS__)
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
32 #include "SDL_config_macos.h"
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
33 #elif defined(__MACOSX__)
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
34 #include "SDL_config_macosx.h"
3975
e85e65aec22f Added S60 port.
Ryan C. Gordon <icculus@icculus.org>
parents: 3888
diff changeset
35 #elif defined(__SYMBIAN32__)
e85e65aec22f Added S60 port.
Ryan C. Gordon <icculus@icculus.org>
parents: 3888
diff changeset
36 #include "SDL_config_symbian.h" /* must be before win32! */
1603
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
37 #elif defined(__WIN32__)
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
38 #include "SDL_config_win32.h"
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
39 #elif defined(__OS2__)
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
40 #include "SDL_config_os2.h"
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
41 #else
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
42 #include "SDL_config_minimal.h"
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
43 #endif /* platform config */
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
44
64710b9f3eeb Fixed bug #171
Sam Lantinga <slouken@libsdl.org>
parents:
diff changeset
45 #endif /* _SDL_config_h */