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

felipe Fri Apr 11 19:01:25 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings bug44703.phpt Modified files: /php-src NEWS /php-src/ext/standard html.c Log: Fixed bug #44703 (htmlspecialchars() does not detect bad character set argument) (patch by Andy Wharmby) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1141&r2=1.2027.2.547.2.1142&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1141 php-src/NEWS:1.2027.2.547.2.1142 --- php-src/NEWS:1.2027.2.547.2.1141 Thu Apr 10 22:31:09 2008 +++ php-src/NEWS Fri Apr 11 19:01:24 2008 @@ -1,6 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Apr 2008, PHP 5.2.6 +- Fixed bug #44703 (htmlspecialchars() does not detect bad character set argument) + (Andy Wharmby) 10 Apr 2008, PHP 5.2.6RC5 - Fixed incorrect heredoc handling when label is used within the block. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.19&r2=1.111.2.2.2.20&diff_format=u Index: php-src/ext/standard/html.c diff -u php-src/ext/standard/html.c:1.111.2.2.2.19 php-src/ext/standard/html.c:1.111.2.2.2.20 --- php-src/ext/standard/html.c:1.111.2.2.2.19 Tue Jan 29 13:39:03 2008 +++ php-src/ext/standard/html.c Fri Apr 11 19:01:25 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: html.c,v 1.111.2.2.2.19 2008/01/29 13:39:03 tony2001 Exp $ */ +/* $Id: html.c,v 1.111.2.2.2.20 2008/04/11 19:01:25 felipe Exp $ */ /* * HTML entity resources: @@ -847,7 +847,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