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

#ifndef __TYPES_R__
#include "Types.r"
#endif

#ifndef __BALLOONS_R__
#include "Balloons.r"
#endif

#define VERSION_MAJOR 		1
#define VERSION_MINOR 		2
#define REVISION     		13

#define STATE	    			release		/* development | alpha | beta | release */
#define RELEASE_NO     		0			      /* number after letter, or zero for release */
#define COUNTRY				  verUS

#define VERSION_STRING 		"1.2.13"

#define NAME					      "SDL"
#define SHORT_DESCRIPTION		"Simple DirectMedia Layer by Sam Lantinga"
#define LONG_DESCRIPTION		"A cross-platform multimedia library.\n\nhttp://www.libsdl.org"

resource 'vers' (1) {
	VERSION_MAJOR,
	(VERSION_MINOR << 4) | REVISION,
	STATE,
	RELEASE_NO,
	COUNTRY,
	VERSION_STRING,
	VERSION_STRING
};

resource 'vers' (2) {
	VERSION_MAJOR,
	(VERSION_MINOR << 4) | REVISION,
	STATE,
	RELEASE_NO,
	COUNTRY,
	VERSION_STRING,
  SHORT_DESCRIPTION
};


	/* Extension Manager info */
data 'CCI�' (128) {		
	NAME "\n\n"
		LONG_DESCRIPTION
};

	/* Finder help balloon */
resource 'hfdr' (kHMHelpID) {
	HelpMgrVersion,
	hmDefaultOptions,
	0,
	0,
	{	
		HMStringItem
		{
			NAME "\n\n"
				LONG_DESCRIPTION
		}
	}
	
};