iliaa Tue Jan 10 16:14:16 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/ext/standard/tests/filters bug35916.phpt
Modified files:
/php-src NEWS
/php-src/main/streams filter.c
Log:
Fixed bug #35916 (Duplicate calls to stream_bucket_append() lead to a crash).
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.342&r2=1.2027.2.343&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.342 php-src/NEWS:1.2027.2.343
--- php-src/NEWS:1.2027.2.342 Sun Jan 8 20:07:21 2006
+++ php-src/NEWS Tue Jan 10 16:14:16 2006
@@ -10,6 +10,8 @@
- Fixed segfault/leak in imagecolormatch(). (Pierre)
- Fixed small leak in mysqli_stmt_fetch() when bound variable was empty string.
(Andrey)
+- Fixed bug #35916 (Duplicate calls to stream_bucket_append() lead to a crash).
+ (Ilia)
- Fixed bug #35908 (curl extension uses undefined GCRY_THREAD_OPTIONS_USER).
(Ilia)
- Fixed bug #35907 (PDO_OCI uses hardcoded lib path $ORACLE_HOME/lib). (Tony)
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/filter.c?r1=1.17.2.1&r2=1.17.2.2&diff_format=u
Index: php-src/main/streams/filter.c
diff -u php-src/main/streams/filter.c:1.17.2.1
php-src/main/streams/filter.c:1.17.2.2
--- php-src/main/streams/filter.c:1.17.2.1 Sun Jan 1 12:50:18 2006
+++ php-src/main/streams/filter.c Tue Jan 10 16:14:16 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.17.2.1 2006/01/01 12:50:18 sniper Exp $ */
+/* $Id: filter.c,v 1.17.2.2 2006/01/10 16:14:16 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -204,6 +204,10 @@
PHPAPI void php_stream_bucket_append(php_stream_bucket_brigade *brigade,
php_stream_bucket *bucket TSRMLS_DC)
{
+ if (brigade->tail == bucket) {
+ return;
+ }
+
bucket->prev = brigade->tail;
bucket->next = NULL;
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/filters/bug35916.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/filters/bug35916.phpt
+++ php-src/ext/standard/tests/filters/bug35916.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
