Re: [PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard streamsfuncs.c

2005-01-15 Thread Derick Rethans 
On Fri, 14 Jan 2005, Dmitry Stogov wrote:

 dmitryFri 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.8r2=1.35.2.9ty=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;}

Please adhere to the coding standards:

if (peername) {
Z_TYPE_P(peername) = IS_STRING;
}

regards,
Derick

-- 
Derick Rethans
http://derickrethans.nl | http://ez.no | http://xdebug.org

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard streamsfuncs.c

2004-12-23 Thread Marcus Boerger 
Hello Wez,

Thursday, December 23, 2004, 7:02:54 AM, you wrote:

 wez Thu Dec 23 01:02:54 2004 EDT

   Modified files:  (Branch: PHP_5_0)
 /php-src/ext/standard   streamsfuncs.c 
   Log:
   MFH: don't crash
  
  
 http://cvs.php.net/diff.php/php-src/ext/standard/streamsfuncs.c?r1=1.35.2.5r2=1.35.2.6ty=u
 Index: php-src/ext/standard/streamsfuncs.c
 diff -u php-src/ext/standard/streamsfuncs.c:1.35.2.5
 php-src/ext/standard/streamsfuncs.c:1.35.2.6
 --- php-src/ext/standard/streamsfuncs.c:1.35.2.5Mon Oct 11 14:32:59 
 2004
 +++ php-src/ext/standard/streamsfuncs.c Thu Dec 23 01:02:54 2004
 @@ -17,7 +17,7 @@
   
 +--+
  */
 
 -/* $Id: streamsfuncs.c,v 1.35.2.5 2004/10/11 18:32:59 iliaa Exp $ */
 +/* $Id: streamsfuncs.c,v 1.35.2.6 2004/12/23 06:02:54 wez Exp $ */
 
  #include php.h
  #include php_globals.h
 @@ -217,7 +217,7 @@
 
 if (peername) {
 zval_dtor(peername);
 -   ZVAL_STRING(peername, NULL, 0);
 +   ZVAL_STRING(peername, , 0);

How can that be , 0 ?
 }
 
 if (0 == php_stream_xport_accept(stream, clistream,




-- 
Best regards,
 Marcusmailto:[EMAIL PROTECTED]

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard streamsfuncs.c

2004-12-23 Thread Wez Furlong 
Doh... will fix it when I get into work...
Marcus Boerger wrote:
   if (peername) {
   zval_dtor(peername);
-   ZVAL_STRING(peername, NULL, 0);
+   ZVAL_STRING(peername, , 0);
How can that be , 0 ?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php