iliaa Fri Sep 7 02:28:42 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/standard string.c
Log:
Added missing safety checks for 2nd parameter of setlocale() function
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.932&r2=1.2027.2.547.2.933&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.932 php-src/NEWS:1.2027.2.547.2.933
--- php-src/NEWS:1.2027.2.547.2.932 Thu Sep 6 10:07:42 2007
+++ php-src/NEWS Fri Sep 7 02:28:42 2007
@@ -2,10 +2,11 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 20??, PHP 5.2.5
- Fixed leaks with mulitple connects on one mysqli object. (Andrey)
-- Fixed endianness detection on MacOS when building universal binary.
+'- Fixed endianness detection on MacOS when building universal binary.
(Uwe Schindler, Christian Speich, Tony)
-- Fixed possible buffer overflows inside the fnmatch() and glob() functions
- reported by Laurent gaffie (Ilia)
+- Fixed possible triggering of buffer overflows inside glibc
+ imlplementations of the fnmatch(), setlocale() and glob() functions reported
+ by Laurent gaffie (Ilia)
- Upgraded PCRE to version 7.3 (Nuno)
- Added optional parameter $provide_object to debug_backtrace(). (Sebastian)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.67&r2=1.445.2.14.2.68&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.67
php-src/ext/standard/string.c:1.445.2.14.2.68
--- php-src/ext/standard/string.c:1.445.2.14.2.67 Sun Aug 5 14:47:42 2007
+++ php-src/ext/standard/string.c Fri Sep 7 02:28:42 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.445.2.14.2.67 2007/08/05 14:47:42 iliaa Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.68 2007/09/07 02:28:42 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -4000,8 +4000,12 @@
loc = NULL;
} else {
loc = Z_STRVAL_PP(plocale);
+ if (Z_STRLEN_PP(plocale) >= 255) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Specified locale name is too long");
+ break;
+ }
}
-
+
retval = setlocale (cat, loc);
zend_update_current_locale();
if (retval) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
