tony2001 Thu Dec 15 22:15:02 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/standard pack.c
Log:
MFH: fix #35690 (pack() tries to allocate huge memory block when packing
float values to strings)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.292&r2=1.2027.2.293&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.292 php-src/NEWS:1.2027.2.293
--- php-src/NEWS:1.2027.2.292 Wed Dec 14 03:36:44 2005
+++ php-src/NEWS Thu Dec 15 22:15:01 2005
@@ -26,6 +26,8 @@
- Fixed many bugs in OCI8. (Tony)
- Fixed crash and leak in mysqli when using 4.1.x client libraries and
connecting to 5.x server. (Andrey)
+- Fixed bug #35690 (pack() tries to allocate huge memory block when packing
+ float values to strings). (Tony)
- Fixed bug #35655 (whitespace following end of heredoc is lost). (Ilia)
- Fixed bug #35630 (strtotime() crashes on certain relative identifiers).
(Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/pack.c?r1=1.57&r2=1.57.2.1&diff_format=u
Index: php-src/ext/standard/pack.c
diff -u php-src/ext/standard/pack.c:1.57 php-src/ext/standard/pack.c:1.57.2.1
--- php-src/ext/standard/pack.c:1.57 Wed Aug 3 14:08:09 2005
+++ php-src/ext/standard/pack.c Thu Dec 15 22:15:01 2005
@@ -15,7 +15,7 @@
| Author: Chris Schneider <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: pack.c,v 1.57 2005/08/03 14:08:09 sniper Exp $ */
+/* $Id: pack.c,v 1.57.2.1 2005/12/15 22:15:01 tony2001 Exp $ */
#include "php.h"
@@ -184,6 +184,7 @@
}
if (arg < 0) {
+ convert_to_string_ex(argv[currentarg]);
arg = Z_STRLEN_PP(argv[currentarg]);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
