felipe Wed Jan 7 17:38:13 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/ext/standard quot_print.c
Log:
- Revert in this branch (attention++, thanks Hannes :D)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1380&r2=1.2027.2.547.2.1381&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1380 php-src/NEWS:1.2027.2.547.2.1381
--- php-src/NEWS:1.2027.2.547.2.1380 Wed Jan 7 17:26:20 2009
+++ php-src/NEWS Wed Jan 7 17:38:12 2009
@@ -11,8 +11,6 @@
(Fixes CVE-2008-5498) (Scott)
- Fixed a segfault when malformed string is passed to json_decode(). (Scott)
-- Fixed bug #47029 (quoted_printable_decode() produces duplicate warning).
- (Andy wharmby)
- Fixed bug #47027 (var_export doesn't show numeric indices on ArrayObject).
(Derick)
- Fixed bug #46985 (OVERWRITE and binary mode does not work, regression
introduced in
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/quot_print.c?r1=1.29.2.2.2.4&r2=1.29.2.2.2.5&diff_format=u
Index: php-src/ext/standard/quot_print.c
diff -u php-src/ext/standard/quot_print.c:1.29.2.2.2.4
php-src/ext/standard/quot_print.c:1.29.2.2.2.5
--- php-src/ext/standard/quot_print.c:1.29.2.2.2.4 Wed Jan 7 17:24:20 2009
+++ php-src/ext/standard/quot_print.c Wed Jan 7 17:38:13 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: quot_print.c,v 1.29.2.2.2.4 2009/01/07 17:24:20 felipe Exp $ */
+/* $Id: quot_print.c,v 1.29.2.2.2.5 2009/01/07 17:38:13 felipe Exp $ */
#include <stdlib.h>
@@ -156,7 +156,7 @@
int i = 0, j = 0, k;
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) ==
FAILURE) {
- return;
+ WRONG_PARAM_COUNT;
}
convert_to_string_ex(arg1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
