cvs: php-src(PHP_5_3) /ext/standard html.c /ext/standard/tests/strings bug44703.phpt

felipe Fri Apr 11 19:06:12 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings bug44703.phpt Modified files: /php-src/ext/standard html.c Log: MFB: Fixed bug #44703 (htmlspecialchars() does not detect bad character set argument) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.14.2.8&r2=1.111.2.2.2.14.2.9&diff_format=u Index: php-src/ext/standard/html.c diff -u php-src/ext/standard/html.c:1.111.2.2.2.14.2.8 php-src/ext/standard/html.c:1.111.2.2.2.14.2.9 --- php-src/ext/standard/html.c:1.111.2.2.2.14.2.8 Tue Jan 29 22:03:01 2008 +++ php-src/ext/standard/html.c Fri Apr 11 19:06:12 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: html.c,v 1.111.2.2.2.14.2.8 2008/01/29 22:03:01 stas Exp $ */ +/* $Id: html.c,v 1.111.2.2.2.14.2.9 2008/04/11 19:06:12 felipe Exp $ */ /* * HTML entity resources: @@ -842,7 +842,7 @@ /* now walk the charset map and look for the codeset */ for (i = 0; charset_map[i].codeset; i++) { - if (strncasecmp(charset_hint, charset_map[i].codeset, len) == 0) { + if (len == strlen(charset_map[i].codeset) && strncasecmp(charset_hint, charset_map[i].codeset, len) == 0) { charset = charset_map[i].charset; found = 1; break; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug44703.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/bug44703.phpt +++ php-src/ext/standard/tests/strings/bug44703.phpt