summaryrefslogtreecommitdiff
path: root/ext/zip/php_zip.c
Commit message (Collapse)AuthorAgeFilesLines
* 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]
* 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.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
* | | add OPSYS_Z_CPM missing constantRemi Collet2014-03-071-0/+1
| | |
* | | Bump yearXinchen Hui2014-01-031-1/+1
| | |
* | | fix compat for PHP ABI changesRemi Collet2013-12-301-8/+22
| | |
* | | Sync with pecl/zip 1.12.4devRemi Collet2013-12-301-2/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - update bunled libzip to 0.11.2 - expose zip_file_set_external_attributes + zip_file_get_external_attributes with new methods: ZipArchive::setExternalAttributesName ZipArchive::setExternalAttributesIndex ZipArchive::getExternalAttributesName ZipArchive::getExternalAttributesIndex
* | | save a few memoryRemi Collet2013-12-191-3/+3
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2013-12-191-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
| * | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-12-191-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
| | * Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)Remi Collet2013-12-191-1/+1
| | |
* | | Merge branch 'pull-request/500'Anatol Belski2013-11-051-8/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pull-request/500: limit virtual_cwd_activate() duplicated call to ZTS only reverted the previous commit, both calls are needed in TS mode virtual_cwd_activate() should be called only in one place back to do_alloca() removed unnecessary call simplify the state free macros compact the code to preserve the error info after state freeing back to do_alloca(), reverted the wrong replacement enabled windows to use stack in both ts/nts mode, some more fixes moved to do_alloca() usage where appropriate fixed invalid free fixed virtual cwd header in phar updated NEWS fixed all the places where last error could be lost preserve the error code applied and fixed the original patch initial move on renaming files and fixing includes Conflicts: ext/opcache/ZendAccelerator.c
| * | | applied and fixed the original patchAnatol Belski2013-10-171-8/+8
| | | | | | | | | | | | | | | | initial work on the patch import done
* | | | Sync ext/zip with pecl/zip version 1.3.2Remi Collet2013-11-041-64/+121
| | | | | | | | | | | | | | | | | | | | | | | | - update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip
* | | | Merge branch 'PHP-5.5'Felipe Pena2013-10-201-4/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * PHP-5.5: - Moved NULL check before dereferencing
| * | | Merge branch 'PHP-5.4' into PHP-5.5Felipe Pena2013-10-201-4/+4
| |\ \ \ | | | |/ | | |/| | | | | | | | | * PHP-5.4: - Moved NULL check before dereferencing
| | * | - Moved NULL check before dereferencingFelipe Pena2013-10-201-4/+4
| | | |
* | | | Merge branch 'PHP-5.5'Felipe Pena2013-10-201-4/+5
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * PHP-5.5: - Fix possible memory leak
| * | Merge branch 'PHP-5.4' into PHP-5.5Felipe Pena2013-10-201-4/+5
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: - Fix possible memory leak
| | * - Fix possible memory leakFelipe Pena2013-10-201-4/+5
| | |
* | | Merge branch 'PHP-5.5'Christopher Jones2013-08-141-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.5: Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. Conflicts: ext/gmp/gmp.c
| * | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-141-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | * PHP-5.4: Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. Conflicts: ext/dba/libinifile/inifile.c
| | * Reduce (some) compile noise of 'unused variable' and 'may be used ↵Christopher Jones2013-08-141-1/+1
| | | | | | | | | | | | uninitialized' warnings.
* | | Merge branch 'PHP-5.5'Anatol Belski2013-04-101-0/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-5.5: update NEWS updated NEWS Fixed bug #64342 ZipArchive::addFile() has to check for file existence
| * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-04-101-0/+7
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.4: updated NEWS Fixed bug #64342 ZipArchive::addFile() has to check for file existence
| | * Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-04-101-0/+7
| | |\ | | | | | | | | | | | | | | | | * PHP-5.3: Fixed bug #64342 ZipArchive::addFile() has to check for file existence
| | | * Fixed bug #64342 ZipArchive::addFile() has to check for file existenceAnatol Belski2013-04-101-0/+7
| | | |
| | | * Happy New Year~Xinchen Hui2013-01-011-1/+1
| | | |
| | | * Fix #62432 ReflectionMethod random corrupt memory on high concurrentJohannes Schlüter2012-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | This fixes the same issue in multiple extensions. This isn't needed in later branches as 5.4 introduced object_properties_init()
| | * | Happy New YearXinchen Hui2013-01-011-1/+1
| | | |
* | | | Merge branch 'PHP-5.5'Stanislav Malyshev2013-02-211-39/+39
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * PHP-5.5: news for bug #49348 fix tests fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
| * | | fix bug #49348 - issue notice on get_property_ptr_ptr when used for readStanislav Malyshev2013-02-181-39/+39
| | | |
* | | | Fix a typo in the ZipArchive error messagesJoey Smith2013-01-081-1/+1
|/ / /
* | | Happy New YearXinchen Hui2013-01-011-1/+1
|/ /
* | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-06-071-1/+1
|\ \ | |/ | | | | | | * PHP-5.3: set current versions for libzip and zip ext
| * set current versions for libzip and zip extAnatoliy Belsky2012-06-071-1/+1
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-06-071-5/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: zip windows fixes fixed bc break related to #57905 fixed a bit overlooked from the last libzip port brought the fix for #47667 back fixed zip entry freeing rechecked the merged libzip, took also the indents from the original to avoid confusion next time fixed a double freeing crash fixed header include initial libzip upgrade patch to 0.10.1 - BFN Conflicts: NEWS
| * fixed zip entry freeingAnatoliy Belsky2012-06-071-5/+10
| |
| * - Year++Felipe Pena2012-01-011-1/+1
| |
| * - Make usage of new PHP_FE_END macroFelipe Pena2011-07-251-2/+1
| |
| * - Fixed bug #54681 (addGlob() crashes on invalid flags)Felipe Pena2011-05-071-0/+32
| |
| * - Fixed bug #53893 (Wrong return value for ZipArchive::extractTo())Pierre Joye2011-02-071-10/+30
| |