cellog Sun May 24 18:50:58 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/phar/tests/tar phar_convert_phar4.phpt
Modified files:
/php-src NEWS
/php-src/ext/phar phar_object.c
Log:
MFH: fix potential segfault when converting phars with metadata to other
formats, add test
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.608&r2=1.2027.2.547.2.965.2.609&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.608
php-src/NEWS:1.2027.2.547.2.965.2.609
--- php-src/NEWS:1.2027.2.547.2.965.2.608 Tue May 19 18:32:25 2009
+++ php-src/NEWS Sun May 24 18:50:57 2009
@@ -19,6 +19,8 @@
PDO_PGSQL). (Matteo)
- Fixed bug #38802 (max_redirects and ignore_errors).
(patch by [email protected])
+- Fixed potential segfault with converting phars containing metadata to other
+ formats (Greg).
07 May 2009, PHP 5.3.0 RC 2
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.61&r2=1.266.2.62&diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.61
php-src/ext/phar/phar_object.c:1.266.2.62
--- php-src/ext/phar/phar_object.c:1.266.2.61 Tue May 5 01:41:51 2009
+++ php-src/ext/phar/phar_object.c Sun May 24 18:50:58 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar_object.c,v 1.266.2.61 2009/05/05 01:41:51 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.62 2009/05/24 18:50:58 cellog Exp $ */
#include "phar_internal.h"
#include "func_interceptors.h"
@@ -2252,6 +2252,22 @@
phar->is_temporary_alias = source->is_temporary_alias;
phar->alias = source->alias;
+ if (source->metadata) {
+ zval *t;
+
+ t = source->metadata;
+ ALLOC_ZVAL(phar->metadata);
+ *phar->metadata = *t;
+ zval_copy_ctor(phar->metadata);
+#if PHP_VERSION_ID < 50300
+ phar->metadata->refcount = 1;
+#else
+ Z_SET_REFCOUNT_P(phar->metadata, 1);
+#endif
+
+ phar->metadata_len = 0;
+ }
+
/* first copy each file's uncompressed contents to a temporary file and
set per-file flags */
for (zend_hash_internal_pointer_reset(&source->manifest); SUCCESS ==
zend_hash_has_more_elements(&source->manifest);
zend_hash_move_forward(&source->manifest)) {
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/phar_convert_phar4.phpt?view=markup&rev=1.1
Index: php-src/ext/phar/tests/tar/phar_convert_phar4.phpt
+++ php-src/ext/phar/tests/tar/phar_convert_phar4.phpt
--TEST--
Phar::convertToPhar() with global metadata
--SKIPIF--
<?php if (!extension_loaded("phar")) die("skip"); ?>
<?php if (!extension_loaded("zlib")) die("skip"); ?>
--INI--
phar.require_hash=0
phar.readonly=0
--FILE--
<?php
$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar';
$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar';
$phar = new Phar($fname);
$phar['a.txt'] = 'some text';
$phar->setMetadata('hi');
$phar->stopBuffering();
var_dump($phar->isFileFormat(Phar::TAR));
var_dump(strlen($phar->getStub()));
var_dump($phar->getMetadata());
$phar = $phar->convertToExecutable(Phar::TAR);
var_dump($phar->isFileFormat(Phar::TAR));
var_dump($phar->getStub());
var_dump($phar->getMetadata());
$phar['a'] = 'hi there';
$phar = $phar->convertToExecutable(Phar::PHAR, Phar::GZ);
var_dump($phar->isFileFormat(Phar::PHAR));
var_dump($phar->isCompressed());
var_dump(strlen($phar->getStub()));
var_dump($phar->getMetadata());
copy($fname . '.gz', $fname2);
$phar = new Phar($fname2);
var_dump($phar->isFileFormat(Phar::PHAR));
var_dump($phar->isCompressed() == Phar::GZ);
var_dump(strlen($phar->getStub()));
var_dump($phar->getMetadata());
?>
===DONE===
--CLEAN--
<?php
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.gz');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') .
'.phar.tar');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') .
'.phar.tar.gz');
__HALT_COMPILER();
?>
--EXPECT--
bool(false)
int(6683)
string(2) "hi"
bool(true)
string(60) "<?php // tar-based phar archive stub file
__HALT_COMPILER();"
string(2) "hi"
bool(true)
int(4096)
int(6683)
string(2) "hi"
bool(true)
bool(true)
int(6683)
string(2) "hi"
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
