PHP mysqlnd svn commit: r1037 - trunk/mysqlnd

[ahristov]

Author: ahristov
Date: 2007-09-13 16:42:22 +0200 (Thu, 13 Sep 2007)
New Revision: 1037

Modified:
   trunk/mysqlnd/mysqlnd_charset.c
Log:
Fix two failing bug reports. One was crash!!


Modified: trunk/mysqlnd/mysqlnd_charset.c
===================================================================
--- trunk/mysqlnd/mysqlnd_charset.c	2007-09-13 14:27:05 UTC (rev 1036)
+++ trunk/mysqlnd/mysqlnd_charset.c	2007-09-13 14:42:22 UTC (rev 1037)
@@ -316,7 +316,7 @@
 	{  13, "sjis", "sjis_japanese_ci", 1, 2, 0, mysqlnd_mbcharlen_sjis, check_mb_sjis},
 	{  16, "hebrew", "hebrew_general_ci", 1, 1, 0, NULL, NULL},
 	{  18, "tis620", "tis620_thai_ci", 1, 1, 0, NULL, NULL},
-	{  19, "euckr", "euckr_korean_ci", 1, 2, 0, mysqlnd_mbcharlen_euckr, check_mb_eucjpms},
+	{  19, "euckr", "euckr_korean_ci", 1, 2, 0, mysqlnd_mbcharlen_euckr, check_mb_euckr},
 	{  22, "koi8u", "koi8u_general_ci", 1, 1, 0, NULL, NULL},
 	{  24, "gb2312", "gb2312_chinese_ci", 1, 2, 0, mysqlnd_mbcharlen_gb2312,
check_mb_gb2312},
 	{  25, "greek", "greek_general_ci", 1, 1, 0, NULL, NULL},	
@@ -338,7 +338,7 @@
 	{  63, "binary", "binary", 1, 1, 0, NULL, NULL},
 	{  92, "geostd8", "geostd8_general_ci", 1, 1, 0, NULL, NULL},
 	{  95, "cp932", "cp932_japanese_ci", 1, 2, 1, mysqlnd_mbcharlen_cp932, check_mb_cp932},
-	{  97, "eucjpms", "eucjpms_japanese_ci", 1, 3, 0, mysqlnd_mbcharlen_eucjpms, },
+	{  97, "eucjpms", "eucjpms_japanese_ci", 1, 3, 0, mysqlnd_mbcharlen_eucjpms,
check_mb_eucjpms},
 	{   2, "latin2", "latin2_czech_cs", 1, 1, 0, NULL, NULL},
 	{   5, "latin1", "latin1_german_ci", 1, 1, 0, NULL, NULL},
 	{  14, "cp1251", "cp1251_bulgarian_ci", 1, 1, 0, NULL, NULL},
@@ -542,7 +542,6 @@
 		/* check unicode characters */
 		if (cset->char_maxlen > 1 && cset->mb_charlen(*escapestr) > 1
&&
 			(len = cset->mb_valid(escapestr, end))) {
-
 			/* check possible overflow */
 			if ((newstr + len) > newstr_e) {
 				escape_overflow = TRUE;