iliaa Thu Sep 11 01:07:51 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/main streams.c
Log:
MFH: Fixed bug #25316 (Possible infinite loop inside _php_stream_write()).
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.388 php-src/NEWS:1.1247.2.389
--- php-src/NEWS:1.1247.2.388 Wed Sep 10 22:00:52 2003
+++ php-src/NEWS Thu Sep 11 01:07:43 2003
@@ -18,6 +18,7 @@
- Fixed bug #25348 ("make install" fails with --enable-short-tags). (Jani)
- Fixed bug #25343 (is_dir() gives warning on FreeBSD). (Jani)
- Fixed bug #25333 (Possible body corruption & crash in win32 mail()). (Ilia)
+- Fixed bug #25316 (Possible infinite loop inside _php_stream_write()). (Ilia)
- Fixed bug #25314 (FTP_ASCII mode behaving like binary from Win->Unix). (Sara)
- Fixed bug #25308 (php -m crashes when zend extensions are loaded). (Stas)
- Fixed bug #25307 (Crash with WDDX serializer). (Sascha, Jani)
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.80 php-src/main/streams.c:1.125.2.81
--- php-src/main/streams.c:1.125.2.80 Tue Sep 9 20:59:46 2003
+++ php-src/main/streams.c Thu Sep 11 01:07:47 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.125.2.80 2003/09/10 00:59:46 iliaa Exp $ */
+/* $Id: streams.c,v 1.125.2.81 2003/09/11 05:07:47 iliaa Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -908,7 +908,8 @@
} else {
justwrote = stream->ops->write(stream, buf, towrite TSRMLS_CC);
}
- if (justwrote > 0) {
+ /* convert justwrote to an integer, since normally it is unsigned */
+ if ((int)justwrote > 0) {
buf += justwrote;
count -= justwrote;
didwrite += justwrote;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
