Re: [PHP-CVS] com php-src: Add optional second arg to unserialize(): ext/standard/basic_functions.c ext/standard/tests/serialize/serialization_error_001.phpt ext/standard/tests/serialize/unserialize_c
On Fri, May 17, 2013 at 12:18 AM, Sara Golemon poll...@php.net wrote: Commit:cfd104582220d578ab1b78a5991065d038e1f931 Author:Sara Golemon poll...@php.net Thu, 16 May 2013 14:37:36 -0700 Parents: bc656cde0453aa6de50812ba9edfc6f74c61ce37 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cfd104582220d578ab1b78a5991065d038e1f931 Log: Add optional second arg to unserialize() Returns the number of bytes consumed by reference for streaming unserialization. Actual unserialization behavior is not modified at all. The need for this came up while trying to parse SplDoublyLinkedList's serialization format which uses a non-standard stream of serialized values. Imho this should have been briefly discussed on internals beforehand. At least to me this seems rather dubious (why is it needed? why are you manually parsing a part of the DLL serialization?) and also clashes with Stas' proposed changes to unserialize. Nikita
[PHP-CVS] com php-src: Improved IS_VAR operands fetching: Zend/zend_execute.c Zend/zend_vm_def.h Zend/zend_vm_execute.h Zend/zend_vm_gen.php
Commit:273ad58295d738b1d146abfae92babc075282d85 Author:Dmitry Stogov dmi...@zend.com Fri, 17 May 2013 13:15:09 +0400 Parents: cfd104582220d578ab1b78a5991065d038e1f931 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=273ad58295d738b1d146abfae92babc075282d85 Log: Improved IS_VAR operands fetching Changed paths: M Zend/zend_execute.c M Zend/zend_vm_def.h M Zend/zend_vm_execute.h M Zend/zend_vm_gen.php Diff: Diff exceeded maximum size -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Recover NEWS: NEWS
Commit:22da0b7364e4290ef57ede40468564d6a4ff2797 Author:Johannes Schlüter johan...@php.net Fri, 17 May 2013 11:22:04 +0200 Parents: 273ad58295d738b1d146abfae92babc075282d85 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=22da0b7364e4290ef57ede40468564d6a4ff2797 Log: Recover NEWS Apperently wrongly merged in revision 488933792a8 Changed paths: M NEWS Diff: Diff exceeded maximum size -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: other fix for #64214, unmodified file may not have old fp set, causing other possible crashes: ext/phar/zip.c
Commit:3eb1745643e6774dcd589705bf566516561d1cff
Author:Pierre Joye pierre@gmail.com Fri, 17 May 2013 11:45:13
+0200
Parents: 86db5fb4c2b7199dc862dfce99c345c49305ba8a
Branches: PHP-5.3 PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=3eb1745643e6774dcd589705bf566516561d1cff
Log:
other fix for #64214, unmodified file may not have old fp set, causing other
possible crashes
Bugs:
https://bugs.php.net/64214
Changed paths:
M ext/phar/zip.c
Diff:
diff --git a/ext/phar/zip.c b/ext/phar/zip.c
index c8057e3..6ba745e 100644
--- a/ext/phar/zip.c
+++ b/ext/phar/zip.c
@@ -937,10 +937,11 @@ is_compressed:
PHAR_SET_32(local.uncompsize, entry-uncompressed_filesize);
PHAR_SET_32(central.compsize, entry-compressed_filesize);
PHAR_SET_32(local.compsize, entry-compressed_filesize);
-
- if (-1 == php_stream_seek(p-old, entry-offset_abs, SEEK_SET))
{
- spprintf(p-error, 0, unable to seek to start of file
\%s\ while creating zip-based phar \%s\, entry-filename,
entry-phar-fname);
- return ZEND_HASH_APPLY_STOP;
+ if (p-old) {
+ if (-1 == php_stream_seek(p-old, entry-offset_abs,
SEEK_SET)) {
+ spprintf(p-error, 0, unable to seek to start
of file \%s\ while creating zip-based phar \%s\, entry-filename,
entry-phar-fname);
+ return ZEND_HASH_APPLY_STOP;
+ }
}
}
not_compressed:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: entry for #64214: NEWS
Commit:46b05bc57aee7a24f87a31a079f9076f4870b780 Author:Pierre Joye pierre@gmail.com Fri, 17 May 2013 11:49:13 +0200 Parents: 3eb1745643e6774dcd589705bf566516561d1cff Branches: PHP-5.3 PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=46b05bc57aee7a24f87a31a079f9076f4870b780 Log: entry for #64214 Bugs: https://bugs.php.net/64214 Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index eae701e..ce86bb2 100644 --- a/NEWS +++ b/NEWS @@ -19,6 +19,10 @@ PHP NEWS . Fixed bug #64821 (Custom Exception crash when internal properties overridden). (Anatol) +- Phar + . Fixed bug #64214 (PHAR PHPTs intermittently crash when run on DFS, SMB or with +non std tmp dir). (Pierre) + 09 May 2013, PHP 5.3.25 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] com php-src: Add optional second arg to unserialize(): ext/standard/basic_functions.c ext/standard/tests/serialize/serialization_error_001.phpt ext/standard/tests/serialize/unserialize_c
Hi! Imho this should have been briefly discussed on internals beforehand. At least to me this seems rather dubious (why is it needed? why are you manually parsing a part of the DLL serialization?) and also clashes with Stas' proposed changes to unserialize. I don't remember any discussion and I think it's rather sad that we're back to commit first, ask anybody else maybe paradigm. There definitely should be notification on the list prior to changing API of one of the very frequently used functions in the core. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
