summaryrefslogtreecommitdiff
path: root/ext/zip/php_zip.c
Commit message (Collapse)AuthorAgeFilesLines
* Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more ↵Dmitry Stogov2015-09-241-3/+3
| | | | appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
* Merge branch 'PHP-5.6'Remi Collet2015-09-071-2/+2
|\ | | | | | | | | * PHP-5.6: Fix build
| * Fix buildRemi Collet2015-09-071-2/+2
| | | | | | | | | | php_zip.c:1647:2: warning: suggest parentheses around assignment used as truth value [-Wparentheses] php_zip.c:1648:3: error: format not a string literal and no format arguments [-Werror=format-security]
* | Merge branch 'PHP-5.6'Christoph M. Becker2015-09-051-2/+8
|\ \ | |/ | | | | | | * PHP-5.6: Fix #70322: ZipArchive::close() doesn't indicate errors
| * Fix #70322: ZipArchive::close() doesn't indicate errorsChristoph M. Becker2015-09-051-2/+8
| | | | | | | | | | | | If an archive can't be written, ZipArchive::close() nonetheless returns TRUE. We fix the return value to properly return success, and additionally raise a warning on failure.
* | Merge branch 'PHP-5.6'Stanislav Malyshev2015-09-021-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: (21 commits) fix unit tests update NEWS add NEWS for fixes Improve fix for #70172 Fix bug #70312 - HAVAL gives wrong hashes in specific cases fix test add test Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage Fix bug #70172 - Use After Free Vulnerability in unserialize() Fix bug #70388 - SOAP serialize_function_call() type confusion Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories Improve fix for #70385 Fix bug #70345 (Multiple vulnerabilities related to PCRE functions) Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes) Fix bug #70219 (Use after free vulnerability in session deserializer) Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP) Fix for bug #69782 Add CVE IDs asigned (post release) to PHP 5.4.43 Add CVE IDs asigned to #69085 (PHP 5.4.39) ... Conflicts: ext/exif/exif.c ext/gmp/gmp.c ext/pcre/php_pcre.c ext/session/session.c ext/session/tests/session_decode_variation3.phpt ext/soap/soap.c ext/spl/spl_observer.c ext/standard/var.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re ext/xsl/xsltprocessor.c
| * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-09-011-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: update NEWS add NEWS for fixes Improve fix for #70172 Fix bug #70312 - HAVAL gives wrong hashes in specific cases fix test add test Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage Fix bug #70172 - Use After Free Vulnerability in unserialize() Fix bug #70388 - SOAP serialize_function_call() type confusion Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories Improve fix for #70385 Fix bug #70345 (Multiple vulnerabilities related to PCRE functions) Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes) Fix bug #70219 (Use after free vulnerability in session deserializer) Fix for bug #69782 Add CVE IDs asigned (post release) to PHP 5.4.43 Add CVE IDs asigned to #69085 (PHP 5.4.39) 5.4.45 next Conflicts: ext/pcre/php_pcre.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re ext/zip/php_zip.c
| | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-09-011-2/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Improve fix for #70172 Fix bug #70312 - HAVAL gives wrong hashes in specific cases fix test add test Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage Fix bug #70172 - Use After Free Vulnerability in unserialize() Fix bug #70388 - SOAP serialize_function_call() type confusion Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories Improve fix for #70385 Fix bug #70345 (Multiple vulnerabilities related to PCRE functions) Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes) Fix bug #70219 (Use after free vulnerability in session deserializer) Fix for bug #69782 Add CVE IDs asigned (post release) to PHP 5.4.43 Add CVE IDs asigned to #69085 (PHP 5.4.39) 5.4.45 next Conflicts: configure.in ext/pcre/php_pcre.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re main/php_version.h
| | | * Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when ↵Stanislav Malyshev2015-08-301-39/+39
| | | | | | | | | | | | | | | | creating directories
| | | * Bump yearXinchen Hui2014-01-031-1/+1
| | | |
| | * | Fix typo: unitialized -> uninitializedLior Kaplan2015-04-011-1/+1
| | | |
| | * | Bump yearXinchen Hui2015-01-151-1/+1
| | | |
| | * | Bump yearXinchen Hui2014-01-031-1/+1
| | | |
| * | | bump yearXinchen Hui2015-01-151-1/+1
| | | |
| * | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/ftp/ftp.h ext/pcre/pcrelib/pcre_printint.c ext/pcre/pcrelib/sljit/sljitLir.c ext/pcre/pcrelib/sljit/sljitLir.h ext/pcre/pcrelib/sljit/sljitNativeARM_32.c ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c ext/pgsql/pgsql.c ext/phar/func_interceptors.c ext/soap/soap.c ext/standard/image.c
* | | | improve error messageAnatol Belski2015-08-191-1/+1
| | | |
* | | | remove TSRMLS_*Anatol Belski2015-08-021-3/+3
| | | | | | | | | | | | | | | | either remains or merged in from PHP5
* | | | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-301-36/+36
| | | | | | | | | | | | | | | | semantick changes).
* | | | Make convert_to_* safe with rc>1Nikita Popov2015-06-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only involves switching zval_dtor to zval_ptr_dtor for arrays and making the convert_to_object for arrays a bit more generic. All the other changes outside zend_operators.c just make use of this new ability (use COPY instead of DUP). What's still missing: Proper references handling. I've seen many convert_to* calls that will break when a reference is used. Also fixes bug #69788.
* | | | return FALSE instead of NULL from ZipArchive::getStream when ↵Christoph M. Becker2015-05-121-0/+2
| | | | | | | | | | | | | | | | php_stream_zip_open() fails (fixes #67161)
* | | | add ZipArchive::setCompressionName and ZipArchive::setCompressionIndex methodsRemi Collet2015-05-061-3/+84
| | | |
* | | | don't use deprecated libzip callRemi Collet2015-05-061-0/+28
| | | |
* | | | Clean up some type conversionsNikita Popov2015-04-271-10/+1
| | | | | | | | | | | | | | | | | | | | While at it also fix some type checks in iconv and drop dead and unported code in standard/filters.
* | | | Fix a couple of warningsRasmus Lerdorf2015-03-201-3/+2
| | | |
* | | | Use specialized macro for string zval creationDmitry Stogov2015-03-121-2/+2
| | | |
* | | | Move zend_object->guards into additional slot of ↵Dmitry Stogov2015-02-041-1/+1
| | | | | | | | | | | | | | | | zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced.
* | | | Cleanup resource handling APIsXinchen Hui2015-02-021-9/+25
| | | |
* | | | bump yearXinchen Hui2015-01-151-1/+1
| | | |
* | | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-132/+132
| | | |
* | | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-231-1/+1
| | | |
* | | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
| | | |
* | | | make it safer for an array underrunAnatol Belski2014-09-141-3/+3
| | | |
* | | | avoid repeated strlen() usageAnatol Belski2014-09-141-3/+5
| | | |
* | | | fix typeAnatol Belski2014-09-121-1/+1
| | | |
* | | | 's' works with size_t round 4Anatol Belski2014-08-271-1/+1
| | | |
* | | | 's' works with size_t round 3Anatol Belski2014-08-271-8/+9
| | | |
* | | | first show to make 's' work with size_tAnatol Belski2014-08-271-10/+10
| | | |
* | | | fixed several long vs zend_long castsAnatol Belski2014-08-261-8/+8
| | | |
* | | | master renames phase 7PRE_AST_MERGEAnatol Belski2014-08-251-1/+1
| | | |
* | | | master renames phase 1Anatol Belski2014-08-251-180/+180
| | | |
* | | | ported ext/zipAnatol Belski2014-08-191-66/+67
| | | |
* | | | basic macro replacements, all at onceAnatol Belski2014-08-191-112/+112
| | | |
* | | | Refactored run_time_cache usage in object handlersDmitry Stogov2014-07-071-6/+6
| | | |
* | | | Use reference counting instead of zval duplicationDmitry Stogov2014-06-051-6/+2
| | | |
* | | | Merge branch 'master' into phpngDmitry Stogov2014-05-261-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fixed issue #183 (TMP_VAR is not only used once) Fix broken Junit output with --disable-cgi Added folder mark Further test fixes for the fdb2709 breakage. Fix broken test caused by fdb2709. Added tests for ZipArchive::addGlob() and ZipArchive::addPattern() Fix run-tests.php with Valgrind >= 3.10.0. Add microseconds to the serialised form of DateTime objects. Improved test for bug #62479 fix typo in ODBC code gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir 5.5.14 now Fix bug #67060: use default mode of 660 Conflicts: ext/date/php_date.c
* | | | Fix ZTSNikita Popov2014-05-051-1/+1
| | | |
* | | | clean upXinchen Hui2014-05-051-16/+0
| | | |
* | | | Finish Zip (all tests pass)Xinchen Hui2014-05-051-2/+6
| | | |
* | | | Romove unnecessary proxy macroXinchen Hui2014-05-051-11/+9
| | | |
* | | | Fixed memory leak in prop_handlers registeringXinchen Hui2014-05-051-1/+5
| | | |
View Lorry Controller Status