Mercurial > sdl-ios-xcode
annotate sdl-config.in @ 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 | 56ec4d962487 |
children |
rev | line source |
---|---|
0 | 1 #!/bin/sh |
2 | |
3 prefix=@prefix@ | |
4 exec_prefix=@exec_prefix@ | |
5 exec_prefix_set=no | |
3929
56ec4d962487
Date: Sat, 31 Mar 2007 16:39:52 +0200
Ryan C. Gordon <icculus@icculus.org>
parents:
1856
diff
changeset
|
6 libdir=@libdir@ |
0 | 7 |
1647
2af911d41a08
Date: Thu, 20 Apr 2006 10:13:34 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
1548
diff
changeset
|
8 @ENABLE_STATIC_FALSE@usage="\ |
2af911d41a08
Date: Thu, 20 Apr 2006 10:13:34 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
1548
diff
changeset
|
9 @ENABLE_STATIC_FALSE@Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs]" |
2af911d41a08
Date: Thu, 20 Apr 2006 10:13:34 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
1548
diff
changeset
|
10 @ENABLE_STATIC_TRUE@usage="\ |
2af911d41a08
Date: Thu, 20 Apr 2006 10:13:34 +0200
Sam Lantinga <slouken@libsdl.org>
parents:
1548
diff
changeset
|
11 @ENABLE_STATIC_TRUE@Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]" |
0 | 12 |
13 if test $# -eq 0; then | |
14 echo "${usage}" 1>&2 | |
15 exit 1 | |
16 fi | |
17 | |
18 while test $# -gt 0; do | |
19 case "$1" in | |
1856
21f13c787b46
Date: Mon, 22 May 2006 01:16:47 -0400
Sam Lantinga <slouken@libsdl.org>
parents:
1647
diff
changeset
|
20 -*=*) optarg=`echo "$1" | LC_ALL="C" sed 's/[-_a-zA-Z0-9]*=//'` ;; |
0 | 21 *) optarg= ;; |
22 esac | |
23 | |
24 case $1 in | |
25 --prefix=*) | |
26 prefix=$optarg | |
27 if test $exec_prefix_set = no ; then | |
28 exec_prefix=$optarg | |
29 fi | |
30 ;; | |
31 --prefix) | |
32 echo $prefix | |
33 ;; | |
34 --exec-prefix=*) | |
35 exec_prefix=$optarg | |
36 exec_prefix_set=yes | |
37 ;; | |
38 --exec-prefix) | |
39 echo $exec_prefix | |
40 ;; | |
41 --version) | |
42 echo @SDL_VERSION@ | |
43 ;; | |
44 --cflags) | |
490
7e53d17ec798
The portable way of including SDL is #include "SDL.h"
Sam Lantinga <slouken@libsdl.org>
parents:
296
diff
changeset
|
45 echo -I@includedir@/SDL @SDL_CFLAGS@ |
0 | 46 ;; |
47 @ENABLE_SHARED_TRUE@ --libs) | |
1548
a77c022733fe
EXTRA_LDFLAGS are the linker flags and libraries needed to build SDL.
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
48 @ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ |
0 | 49 @ENABLE_SHARED_TRUE@ ;; |
50 @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) | |
51 @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) | |
1548
a77c022733fe
EXTRA_LDFLAGS are the linker flags and libraries needed to build SDL.
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
52 @ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@ |
0 | 53 @ENABLE_STATIC_TRUE@ ;; |
54 *) | |
55 echo "${usage}" 1>&2 | |
56 exit 1 | |
57 ;; | |
58 esac | |
59 shift | |
60 done |