dmitry Fri Jan 14 03:51:43 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard streamsfuncs.c
Log:
Fixed SIGSEGV with ext/standard/tests/network/tcp4loop.phpt and
ext/standard/tests/network/unixloop.phpt
http://cvs.php.net/diff.php/php-src/ext/standard/streamsfuncs.c?r1=1.35.2.8&r2=1.35.2.9&ty=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.35.2.8
php-src/ext/standard/streamsfuncs.c:1.35.2.9
--- php-src/ext/standard/streamsfuncs.c:1.35.2.8 Tue Jan 4 10:31:34 2005
+++ php-src/ext/standard/streamsfuncs.c Fri Jan 14 03:51:43 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.35.2.8 2005/01/04 15:31:34 wez Exp $ */
+/* $Id: streamsfuncs.c,v 1.35.2.9 2005/01/14 08:51:43 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -227,7 +227,7 @@
&tv, &errstr
TSRMLS_CC) && clistream) {
- Z_TYPE_P(peername) = IS_STRING;
+ if (peername) {Z_TYPE_P(peername) = IS_STRING;}
php_stream_to_zval(clistream, return_value);
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "accept failed:
%s", errstr ? errstr : "Unknown error");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
