summaryrefslogtreecommitdiff
path: root/ext/phar
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2017-01-025-4/+35
|\ | | | | | | | | | | | | | | | | * PHP-7.0: Fix bug #73737 FPE when parsing a tag format Fix bug #73773 - Seg fault when loading hostile phar Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data() Fix bug #73768 - Memory corruption when loading hostile phar Fix int overflows in phar (bug #73764)
| * Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2017-01-025-4/+35
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fix bug #73737 FPE when parsing a tag format Fix bug #73773 - Seg fault when loading hostile phar Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data() Fix bug #73768 - Memory corruption when loading hostile phar Fix int overflows in phar (bug #73764)
| | * Fix bug #73773 - Seg fault when loading hostile pharStanislav Malyshev2016-12-311-2/+2
| | |
| | * Fix bug #73768 - Memory corruption when loading hostile pharStanislav Malyshev2016-12-303-2/+17
| | |
| | * Fix int overflows in phar (bug #73764)Stanislav Malyshev2016-12-303-2/+18
| | |
| | * Fix bug #73035 (Out of bound when verify signature of tar phar in ↵Stanislav Malyshev2016-09-123-1/+19
| | | | | | | | | | | | phar_parse_tarfile)
| | * Fix bug #72928 - Out of bound when verify signature of zip phar in ↵Stanislav Malyshev2016-09-124-1/+47
| | | | | | | | | | | | phar_parse_zipfile
| * | Silence warning from unhandled enumSara Golemon2016-12-171-0/+2
| | | | | | | | | | | | (cherry picked from commit 57bbe2c140752f491b1fa24336b817bd48f65a93)
| * | fix leaking streams and memory mapped filesAnatol Belski2016-12-171-7/+19
| | | | | | | | | | | | (cherry picked from commit f1ff23095b1a4fe6d6a65331dda7832ae02eb1a1)
| * | Fix more size_t/int implicit conversionsStanislav Malyshev2016-11-251-66/+149
| | | | | | | | | | | | | | | Now the conversions are explicit and do checks. Not sure it's the best way but at least we can see them now in the open.
| * | Fix int/size_t confusion in isValidPharFilename (bug #73580)Stanislav Malyshev2016-11-251-0/+4
| | |
* | | Silence warning from unhandled enumSara Golemon2016-12-161-0/+2
| | | | | | | | | | | | (cherry picked from commit 57bbe2c140752f491b1fa24336b817bd48f65a93)
* | | fix leaking streams and memory mapped filesAnatol Belski2016-12-161-7/+19
| | | | | | | | | | | | (cherry picked from commit f1ff23095b1a4fe6d6a65331dda7832ae02eb1a1)
* | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-11-251-66/+149
|\ \ \ | | | | | | | | | | | | | | | | * PHP-7.0: Fix more size_t/int implicit conversions
| * | | Fix more size_t/int implicit conversionsStanislav Malyshev2016-11-251-66/+149
| | | | | | | | | | | | | | | | | | | | Now the conversions are explicit and do checks. Not sure it's the best way but at least we can see them now in the open.
* | | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-11-251-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.0: Fix int/size_t confusion in isValidPharFilename (bug #73580)
| * | | Fix int/size_t confusion in isValidPharFilename (bug #73580)Stanislav Malyshev2016-11-251-0/+4
| |/ /
* | | Remove binary casts from PHAR's default stubPedro Magalhães2016-11-0918-66/+65
| | |
* | | fix erroneous resource destructionAnatol Belski2016-09-141-18/+2
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-09-127-2/+66
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: (22 commits) Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields I don't think 8cceb012a7aabf3c36ab7c2724a436f976cdd165 is needed Fix test Add check in fgetcsv in case sizeof(unit) != sizeof(size_t) Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile) Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction Fix bug #73029 - Missing type check when unserializing SplArray Fix bug #72860: wddx_deserialize use-after-free Fix bug #73007: add locale length check Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile sync NEWS Revert "Merge branch 'PHP-5.6' into PHP-7.0" Merge branch 'PHP-5.6' into PHP-7.0 Merge branch 'PHP-5.6' into PHP-7.0 Revert "Revert "Merge branch 'PHP-5.6' into PHP-7.0"" fix version sync NEWS Fix bug #72957 set versions ...
| * | Merge branch 'PHP-7.0.11' into PHP-7.0Stanislav Malyshev2016-09-127-2/+66
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0.11: (22 commits) Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields I don't think 8cceb012a7aabf3c36ab7c2724a436f976cdd165 is needed Fix test Add check in fgetcsv in case sizeof(unit) != sizeof(size_t) Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile) Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction Fix bug #73029 - Missing type check when unserializing SplArray Fix bug #72860: wddx_deserialize use-after-free Fix bug #73007: add locale length check Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile sync NEWS Revert "Merge branch 'PHP-5.6' into PHP-7.0" Merge branch 'PHP-5.6' into PHP-7.0 Merge branch 'PHP-5.6' into PHP-7.0 Revert "Revert "Merge branch 'PHP-5.6' into PHP-7.0"" fix version sync NEWS Fix bug #72957 set versions ...
| | * | Fix bug #73035 (Out of bound when verify signature of tar phar in ↵Stanislav Malyshev2016-09-123-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | phar_parse_tarfile) (cherry picked from commit 75ebf471ff46ec6e5ee279b3650c11d51ebaf9e3)
| | * | Fix bug #72928 - Out of bound when verify signature of zip phar in ↵Stanislav Malyshev2016-09-124-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | phar_parse_zipfile (cherry picked from commit 19484ab77466f99c78fc0e677f7e03da0584d6a2)
* | | | Fix #72948: Uncatchable "Catchable" fatal error for class to string conversionsChristoph M. Becker2016-09-0312-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | E_RECOVERABLE errors are reported as "Catchable fatal error". This is misleading, because they actually can't be caught via try-catch statements. Therefore we change the wording to "Recoverable fatal error" as suggested by Nikita.
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-09-031-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.0: fix double free
| * | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-09-031-1/+0
| |\ \ \ | | |/ / | |/| / | | |/ | | | * PHP-5.6: fix double free
| | * fix double freeAnatol Belski2016-09-031-1/+0
| | |
* | | fix leakAnatol Belski2016-09-021-0/+25
| | |
* | | fix leakAnatol Belski2016-09-021-0/+5
| | |
* | | fix useless assignmentAnatol Belski2016-09-011-1/+0
| | |
* | | call_user_func(_array): Don't abort on reference warningNikita Popov2016-08-236-4/+4
| | | | | | | | | | | | | | | | | | Change zend_call_function() to not abort the call if a non-reference is passed to a reference argument. The usual warning will still be thrown, but the call will proceed as usual.
* | | Use opaque EVP_MD in phar_verify_signatureJakub Zelenka2016-07-171-6/+7
| | |
* | | Fixed compilation warningsDmitry Stogov2016-06-231-3/+3
| | |
* | | Fixed compilation warningsDmitry Stogov2016-06-226-18/+18
| | |
* | | Merge branch 'PHP-7.0'Anatol Belski2016-06-211-3/+3
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: fix test
| * | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-06-211-3/+3
| |\ \ | | |/ | | | | | | | | | * PHP-5.6: fix test
| | * fix testAnatol Belski2016-06-211-3/+3
| | | | | | | | | | | | | | | | | | There is a difference between TS and NTS warning message, since virtual_mkdir vs glibc directly is used. This has no effect for the actual fix functionality.
* | | Added ZEND_ATTRIBUTE_FORMAT to some middind functions.Dmitry Stogov2016-06-212-15/+15
| | | | | | | | | | | | | | | "%p" replaced by ZEND_LONG_FMT to avoid compilation warnings. Fixed most incorrect use cases of format specifiers.
* | | Merge branch 'PHP-7.0'Stanislav Malyshev2016-06-214-2/+28
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: iFixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow update NEWS fix tests fix build Fix bug #72455: Heap Overflow due to integer overflows Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize Fix bug #72407: NULL Pointer Dereference at _gdScaleVert Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free Fix bug #72298 pass2_no_dither out-of-bounds access Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow Fix bug #72262 - do not overflow int Fix bug #72400 and #72403 - prevent signed int overflows for string lengths Fix bug #72275: don't allow smart_str to overflow int Fix bug #72340: Double Free Courruption in wddx_deserialize Fix bug #72321 - use efree() for emalloc allocation 5.6.23RC1 fix NEWS set versions
| * | Merge branch 'PHP-5.6.23' into PHP-7.0.8Stanislav Malyshev2016-06-214-2/+28
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6.23: (24 commits) iFixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow update NEWS fix tests fix build Fix bug #72455: Heap Overflow due to integer overflows Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize Fix bug #72407: NULL Pointer Dereference at _gdScaleVert Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free Fix bug #72298 pass2_no_dither out-of-bounds access Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow Fix bug #72262 - do not overflow int Fix bug #72400 and #72403 - prevent signed int overflows for string lengths Fix bug #72275: don't allow smart_str to overflow int Fix bug #72340: Double Free Courruption in wddx_deserialize update NEWS Fix #66387: Stack overflow with imagefilltoborder Fix bug #72321 - use efree() for emalloc allocation 5.6.23RC1 Fix bug #72140 (segfault after calling ERR_free_strings()) ... Conflicts: configure.in ext/mbstring/php_mbregex.c ext/mcrypt/mcrypt.c ext/spl/spl_array.c ext/spl/spl_directory.c ext/standard/php_smart_str.h ext/standard/string.c ext/standard/url.c ext/wddx/wddx.c ext/zip/php_zip.c main/php_version.h
| | * Fix bug #72321 - use efree() for emalloc allocationStanislav Malyshev2016-06-124-2/+28
| | |
* | | Merge branch 'PHP-7.0'Anatol Belski2016-03-291-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: fix dir separator in test
| * | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-03-291-2/+2
| |\ \ | | |/ | | | | | | | | | * PHP-5.6: fix dir separator in test
| | * Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2016-03-291-2/+2
| | |\ | | | | | | | | | | | | | | | | * PHP-5.5: fix dir separator in test
| | | * fix dir separator in testAnatol Belski2016-03-291-2/+2
| | | |
| | * | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2016-03-289-42/+46
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut Fix bug #71798 - Integer Overflow in php_raw_url_encode Fix bug #71860: Require valid paths for phar filenames Going for 5.5.34 Conflicts: configure.in ext/phar/tests/create_path_error.phpt main/php_version.h
* | | | Merge branch 'PHP-7.0'Anatol Belski2016-03-299-37/+45
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: Fixed bug #71704 php_snmp_error() Format String Vulnerability Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut Updated to version 2016.3 (2016c) Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file Fix bug #71798 - Integer Overflow in php_raw_url_encode update NEWS Disable huge pages in the Zend allocator by default As per the discussion on internals, this is an expert feature that needs special system-level configuration and care. Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0. Fix bug #71860: Require valid paths for phar filenames Fix bug #71860: Require valid paths for phar filenames update NEWS Fixed bug #71704 php_snmp_error() Format String Vulnerability Merge branch 'PHP-5.6' into PHP-7.0 Updated to version 2016.2 (2016b) update libs versions set RC1 versions Going for 5.5.34
| * | | Merge branch 'PHP-5.5' into PHP-7.0.5Stanislav Malyshev2016-03-281-0/+4
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #71704 php_snmp_error() Format String Vulnerability Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcut Fix bug #71798 - Integer Overflow in php_raw_url_encode Fix bug #71860: Require valid paths for phar filenames Going for 5.5.34 Conflicts: configure.in ext/phar/phar_object.c ext/phar/tests/badparameters.phpt ext/phar/tests/create_path_error.phpt ext/phar/tests/pharfileinfo_construct.phpt ext/snmp/snmp.c ext/standard/url.c main/php_version.h
| | * | Fix bug #71860: Require valid paths for phar filenamesStanislav Malyshev2016-03-209-37/+41
| | | |
| * | | Fix bug #71860: Require valid paths for phar filenamesStanislav Malyshev2016-03-209-37/+41
| | | |