summaryrefslogtreecommitdiff
path: root/ext/intl
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-09-121-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * Fix bug #73007: add locale length checkStanislav Malyshev2016-09-121-0/+2
| | | | | | | | | | | | | | (cherry picked from commit 9e07089626f373d0e7b24b7aeb8b8459aae5f5f8) Conflicts: ext/intl/msgformat/msgformat_format.c
* | sync testsAnatol Belski2016-08-312-3/+3
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-291-4/+3
|\ \ | |/ | | | | | | * PHP-7.0: fix double free
| * Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-08-291-4/+3
| |\ | | | | | | | | | | | | * PHP-5.6: fix double free
| | * fix double freeAnatol Belski2016-08-291-4/+3
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-291-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: fix double free
| * | fix double freeAnatol Belski2016-08-291-1/+1
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-08-202-1/+20
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-08-202-1/+20
| |\ \ | | |/
| | * Fix #65732: grapheme_*() is not Unicode compliant on CR LF sequenceChristoph M. Becker2016-08-202-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | According to the Unicode specification (at least as of 5.1), CRLF sequences are considered to be a single grapheme. We cater to that special case by letting grapheme_ascii_check() fail. While it would be trivial to fix grapheme_ascii_check() wrt. grapheme_strlen(), grapheme_substr() and grapheme_strrpos() would be much harder to handle, so we accept the slight performance penalty if CRLF is involved.
* | | fix broken proto docAnatol Belski2016-07-261-5/+5
| | |
* | | fix compiler warningAnatol Belski2016-07-261-1/+1
| | |
* | | fix data typeAnatol Belski2016-07-261-2/+2
| | |
* | | use more suitable types here, tooAnatol Belski2016-07-251-39/+35
| | | | | | | | | | | | and simplify the loop
* | | change to more suitable datatypesAnatol Belski2016-07-251-5/+5
| | |
* | | Fixed bug #72658 Locale::lookup() / locale_lookup() hangs if no match foundAnatol Belski2016-07-252-4/+22
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-07-241-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-07-241-1/+1
| |\ \ | | |/
| | * More tolerance in another IntlCalendar testNikita Popov2016-07-241-1/+1
| | | | | | | | | | | | | | | Again, off-by-1000 is expected if we're late in the second. Add an extra 1000 to account for actual delta in call times.
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-07-221-2/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-07-221-2/+2
| |\ \ | | |/
| | * Make IntlCalendar::getNow() test more tolerantNikita Popov2016-07-221-2/+2
| | | | | | | | | | | | | | | Due to the *1000 factor the two values may be off-by-1000 even without any actual delay, so increase the check to 2000.
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-07-212-1/+18
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fixed bug #72639 (Segfault when instantiating class that extends IntlCalendar and adds a property)
| * | Fixed bug #72639 (Segfault when instantiating class that extends ↵Xinchen Hui2016-07-212-1/+18
| | | | | | | | | | | | IntlCalendar and adds a property)
* | | Merge branch 'PHP-7.0'Stanislav Malyshev2016-07-192-0/+48
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: (27 commits) fix #72519, possible OOB using imagegif fix #72512, invalid read or write for palette image when invalid transparent index is used Apparently some envs miss SIZE_MAX Fix tests Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment Partial fix for bug #72613 - do not allow reading past error read Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c Fix for bug #72558, Integer overflow error within _gdContributionsAlloc() Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE update NEWS Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders Fix bug #72562 - destroy var_hash properly Fix bug #72551 and bug #72552 - check before converting size_t->int Fix bug #72541 - size_t overflow lead to heap corruption Fix bug #72533 (locale_accept_from_http out-of-bounds access) Fix fir bug #72520 Fix for bug #72513 Fix for bug #72513 CS fix and comments with bug ID ... Conflicts: ext/standard/basic_functions.c
| * | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-07-192-0/+48
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: fix #72519, possible OOB using imagegif fix #72512, invalid read or write for palette image when invalid transparent index is used Apparently some envs miss SIZE_MAX Fix tests Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c Fix for bug #72558, Integer overflow error within _gdContributionsAlloc() Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE Fix bug #72562 - destroy var_hash properly Fix bug #72533 (locale_accept_from_http out-of-bounds access) Fix fir bug #72520 Fix for bug #72513 Fix for bug #72513 CS fix and comments with bug ID Fix for HTTP_PROXY issue. 5.6.24RC1 add tests for bug #72512 Fixed bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access Fixed bug #72479 - same as #72434 Conflicts: Zend/zend_virtual_cwd.c ext/bz2/bz2.c ext/exif/exif.c ext/session/session.c ext/snmp/snmp.c ext/standard/basic_functions.c main/SAPI.c main/php_variables.c
| | * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2016-07-192-0/+48
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: fix #72519, possible OOB using imagegif fix #72512, invalid read or write for palette image when invalid transparent index is used Apparently some envs miss SIZE_MAX Fix tests Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c Fix for bug #72558, Integer overflow error within _gdContributionsAlloc() Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE Fix bug #72562 - destroy var_hash properly Fix bug #72533 (locale_accept_from_http out-of-bounds access) Fix fir bug #72520 Fix for bug #72513 CS fix and comments with bug ID Fix for HTTP_PROXY issue. add tests for bug #72512 Fixed bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access Fixed bug #72479 - same as #72434 Conflicts: ext/bz2/bz2.c main/SAPI.c main/php_variables.c
| | | * Fix bug #72533 (locale_accept_from_http out-of-bounds access)Stanislav Malyshev2016-07-122-0/+48
| | | |
* | | | Remove useless dtor handlers in intlNikita Popov2016-07-167-58/+1
| | | | | | | | | | | | | | | | These are only indirections to the default handler
* | | | Fix leak in intl collator compare functionNikita Popov2016-07-161-1/+3
| | | |
* | | | Merge branch 'PHP-7.0'Christoph M. Becker2016-07-122-7/+38
|\ \ \ \ | |/ / / | | | | | | | | | | | | # Resolved conflicts: # ext/intl/idn/idn.c
| * | | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-122-4/+38
| |\ \ \ | | |/ / | | | | | | | | | | | | # Resolved conflicts: # ext/intl/idn/idn.c
| | * | Partially fix #72506: idn_to_ascii for UTS #46 incorrect for long domain namesChristoph M. Becker2016-07-122-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't actually fix this issue wrt. the empty $info array, because it is not clear what this array should contain and we're concerned about the potential BC break, but at least we fix the inconsistent handling of resulting domains with 255 bytes (which raise an error), and longer domains (which just return FALSE), what has to be considered a very minor BC break if at all.
* | | | fix error textAnatol Belski2016-07-051-2/+2
| | | |
* | | | fix datatypes and add range checksAnatol Belski2016-07-051-4/+14
| | | |
* | | | re-add range checkAnatol Belski2016-07-051-3/+12
| | | |
* | | | Revert "fix datatype and add range check"Anatol Belski2016-07-051-8/+1
| | | | | | | | | | | | | | | | This reverts commit 14bdd8246c50b55d1ddf838b45de34065e8613c4.
* | | | fix datatype and add range checkAnatol Belski2016-07-051-1/+8
| | | |
* | | | Merge branch 'throw-error-in-extensions'Aaron Piotrowski2016-07-0510-13/+38
|\ \ \ \
| * | | | Switch failure to register class back to E_ERRORAaron Piotrowski2016-06-301-1/+1
| | | | |
| * | | | E_RECOVERABLE_ERROR -> thrown ErrorAaron Piotrowski2016-06-148-11/+33
| | | | |
| * | | | Replace zend_ce_error with NULL and replace more E_ERROR with thrown ErrorAaron Piotrowski2016-06-133-4/+3
| | | | |
| * | | | Merge branch 'master' into throw-error-in-extensionsAaron Piotrowski2016-06-1065-265/+1223
| |\ \ \ \
| * | | | | Convert E_ERROR to thrown Error in extensionsAaron Piotrowski2015-07-052-2/+6
| | | | | |
* | | | | | Fixed compilation warningsDmitry Stogov2016-06-281-9/+0
| | | | | |
* | | | | | remove unused declarationsAnatol Belski2016-06-231-16/+0
| | | | | |
* | | | | | Fixed compilation warningsDmitry Stogov2016-06-2211-20/+18
| | | | | |
* | | | | | fix include orderAnatol Belski2016-06-213-3/+6
| | | | | |
* | | | | | Added ZEND_ATTRIBUTE_FORMAT to some middind functions.Dmitry Stogov2016-06-214-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "%p" replaced by ZEND_LONG_FMT to avoid compilation warnings. Fixed most incorrect use cases of format specifiers.