cvs: php4 /ext/standard fsock.c
| From: | Derick Rethans | Date: | Wed, 14 Nov 2001 09:48:14 +0000 |
| Subject: | cvs: php4 /ext/standard fsock.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8206@lists.php.net to get a copy of this message | ||
derick Wed Nov 14 04:48:14 2001 EDT
Modified files:
/php4/ext/standard fsock.c
Log:
- Fix crashbug on dtor
Index: php4/ext/standard/fsock.c
diff -u php4/ext/standard/fsock.c:1.82 php4/ext/standard/fsock.c:1.83
--- php4/ext/standard/fsock.c:1.82 Sun Nov 4 07:40:45 2001
+++ php4/ext/standard/fsock.c Wed Nov 14 04:48:14 2001
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.c,v 1.82 2001/11/04 12:40:45 alexwaugh Exp $ */
+/* $Id: fsock.c,v 1.83 2001/11/14 09:48:14 derick Exp $ */
/* Synced with php 3.0 revision 1.121 1999-06-18 [ssb] */
/* Synced with php 3.0 revision 1.133 1999-07-21 [sas] */
@@ -181,11 +181,11 @@
timeout.tv_usec = conv % 1000000;
/* fall-through */
case 4:
- zval_ptr_dtor(args[3]);
+ zval_dtor(*args[3]);
ZVAL_STRING(*args[3], "", 1);
/* fall-through */
case 3:
- zval_ptr_dtor(args[2]);
+ zval_dtor(*args[2]);
ZVAL_LONG(*args[2], 0);
break;
}
@@ -231,11 +231,11 @@
CLOSE_SOCK(1);
if (arg_count>2) {
- zval_ptr_dtor(args[2]);
+ zval_dtor(*args[2]);
ZVAL_LONG(*args[2], errno);
}
if (arg_count>3) {
- zval_ptr_dtor(args[3]);
+ zval_dtor(*args[3]);
ZVAL_STRING(*args[3], strerror(errno), 1);
}
RETURN_FALSE;
@@ -257,11 +257,11 @@
if (php_connect_nonb(socketd, (struct sockaddr *) &unix_addr, sizeof(unix_addr),
&timeout) == SOCK_CONN_ERR) {
CLOSE_SOCK(1);
if (arg_count>2) {
- zval_ptr_dtor(args[2]);
+ zval_dtor(*args[2]);
ZVAL_LONG(*args[2], errno);
}
if (arg_count>3) {
- zval_ptr_dtor(args[3]);
+ zval_dtor(*args[3]);
ZVAL_STRING(*args[3], strerror(errno), 1);
}
RETURN_FALSE;