tony2001 Thu Aug 24 08:42:16 2006 UTC
Added files: (Branch: PHP_4_4)
/php-src/ext/standard/tests/file bug38450.phpt
Modified files:
/php-src NEWS
/php-src/main user_streams.c
Log:
fix #38450 (constructor is not called for classes used in userspace stream
wrappers)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.158&r2=1.1247.2.920.2.159&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.158 php-src/NEWS:1.1247.2.920.2.159
--- php-src/NEWS:1.1247.2.920.2.158 Thu Aug 24 08:30:28 2006
+++ php-src/NEWS Thu Aug 24 08:42:16 2006
@@ -1,6 +1,8 @@
PHP 4 NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2006, Version 4.4.5
+- Fixed bug #38450 (constructor is not called for classes used in userspace
+ stream wrappers). (Tony)
- Fixed bug #38378 (wddx_serialize_value() generates no wellformed xml).
(sj at sjaensch dot org, grzegorz dot nosek at netart dot pl, Tony).
http://cvs.php.net/viewvc.cgi/php-src/main/user_streams.c?r1=1.29.2.4.2.2&r2=1.29.2.4.2.3&diff_format=u
Index: php-src/main/user_streams.c
diff -u php-src/main/user_streams.c:1.29.2.4.2.2
php-src/main/user_streams.c:1.29.2.4.2.3
--- php-src/main/user_streams.c:1.29.2.4.2.2 Sun Jan 1 13:47:00 2006
+++ php-src/main/user_streams.c Thu Aug 24 08:42:16 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: user_streams.c,v 1.29.2.4.2.2 2006/01/01 13:47:00 sniper Exp $ */
+/* $Id: user_streams.c,v 1.29.2.4.2.3 2006/08/24 08:42:16 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -193,7 +193,33 @@
object_init_ex(us->object, uwrap->ce);
ZVAL_REFCOUNT(us->object) = 1;
PZVAL_IS_REF(us->object) = 1;
-
+
+ if (zend_hash_exists(&uwrap->ce->function_table, uwrap->ce->name,
uwrap->ce->name_length+1)) {
+ zval *retval_ptr;
+ zval *function_name;
+
+ MAKE_STD_ZVAL(function_name);
+ ZVAL_STRINGL(function_name, uwrap->ce->name,
uwrap->ce->name_length, 1);
+
+ if (call_user_function_ex(EG(function_table), &us->object,
function_name, &retval_ptr, 0, 0, 1, NULL TSRMLS_CC) == FAILURE) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not
execute %s::%s()", uwrap->ce->name, uwrap->ce->name);
+ zval_dtor(function_name);
+ FREE_ZVAL(function_name);
+ zval_dtor(us->object);
+ FREE_ZVAL(us->object);
+ efree(us);
+ FG(user_stream_current_filename) = NULL;
+ return NULL;
+ } else {
+ if (retval_ptr) {
+ zval_ptr_dtor(&retval_ptr);
+ }
+ }
+ zval_dtor(function_name);
+ FREE_ZVAL(function_name);
+ }
+
+
/* call it's stream_open method - set up params first */
MAKE_STD_ZVAL(zfilename);
ZVAL_STRING(zfilename, filename, 1);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug38450.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/file/bug38450.phpt
+++ php-src/ext/standard/tests/file/bug38450.phpt
--TEST--
Bug #38450 (constructor is not called for classes used in userspace stream
wrappers)
--FILE--
<?php
class VariableStream {
var $position;
var $varname;
function VariableStream($var) {
var_dump("constructor!");
}
function stream_open($path, $mode, $options, &$opened_path)
{
$url = parse_url($path);
$this->varname = $url["host"];
$this->position = 0;
return true;
}
function stream_read($count)
{
$ret = substr($GLOBALS[$this->varname], $this->position,
$count);
$this->position += strlen($ret);
return $ret;
}
function stream_write($data)
{
$left = substr($GLOBALS[$this->varname], 0, $this->position);
$right = substr($GLOBALS[$this->varname], $this->position +
strlen($data));
$GLOBALS[$this->varname] = $left . $data . $right;
$this->position += strlen($data);
return strlen($data);
}
function stream_tell()
{
return $this->position;
}
function stream_eof()
{
return $this->position >= strlen($GLOBALS[$this->varname]);
}
function stream_seek($offset, $whence)
{
switch ($whence) {
case SEEK_SET:
if ($offset < strlen($GLOBALS[$this->varname]) &&
$offset >= 0) {
$this->position = $offset;
return true;
} else {
return false;
}
break;
case SEEK_CUR:
if ($offset >= 0) {
$this->position += $offset;
return true;
} else {
return false;
}
break;
case SEEK_END:
if (strlen($GLOBALS[$this->varname]) + $offset >= 0) {
$this->position =
strlen($GLOBALS[$this->varname]) + $offset;
return true;
} else {
return false;
}
break;
default:
return false;
}
}
}
stream_wrapper_register("var", "VariableStream")
or die("Failed to register protocol");
$myvar = "";
$fp = fopen("var://myvar", "r+");
fwrite($fp, "line1\n");
fwrite($fp, "line2\n");
fwrite($fp, "line3\n");
rewind($fp);
while (!feof($fp)) {
echo fgets($fp);
}
fclose($fp);
var_dump($myvar);
echo "Done\n";
?>
--EXPECTF--
Warning: Missing argument 1 for VariableStream::VariableStream() in %s on line
%d
string(12) "constructor!"
line1
line2
line3
string(18) "line1
line2
line3
"
Done
--UEXPECTF--
Warning: Missing argument 1 for VariableStream::VariableStream() in %s on line
%d
unicode(12) "constructor!"
line1
line2
line3
string(18) "line1
line2
line3
"
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
