summaryrefslogtreecommitdiff
path: root/ext/mbstring
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headers to 2017Sammy Kaye Powers2017-01-047-7/+7
|
* Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-12-171-3/+6
|\ | | | | | | | | * PHP-5.6: fix C89 compat
| * fix C89 compatAnatol Belski2016-12-171-3/+6
| |
| * Add more mbfl string size checks (bug #73505)Stanislav Malyshev2016-11-261-1/+29
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-11-261-0/+28
|\ \ | | | | | | | | | | | | * PHP-5.6: Add more mbfl string size checks (bug #73505)
| * | Add more mbfl string size checks (bug #73505)Stanislav Malyshev2016-11-261-1/+29
| |/
| * Fix bug #73082Stanislav Malyshev2016-09-251-48/+48
| |
| * Fix bug26639.phptYasuo Ohgaki2016-09-081-0/+1
| |
* | remove TSRMLS_*Anatol Belski2016-11-211-2/+2
| |
* | Prevent modification of immutable arrays (ext/mbstring/tests/bug26639.phpt ↵Dmitry Stogov2016-11-171-12/+20
| | | | | | | | failure with opcache.protect_memory=1)
* | Merge branch 'PHP-5.6' into PHP-7.0Yasuo Ohgaki2016-09-081-2/+2
|\ \ | |/ | | | | | | * PHP-5.6: Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
| * Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charsetYasuo Ohgaki2016-09-081-3/+3
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Yasuo Ohgaki2016-09-062-1/+90
|\ \ | |/ | | | | | | * PHP-5.6: Fixed Bug #66964 mb_convert_variables() cannot detect recursion
| * Fixed Bug #66964 mb_convert_variables() cannot detect recursionYasuo Ohgaki2016-09-062-12/+102
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-09-041-3/+5
|\ \ | |/ | | | | | | * PHP-5.6: Sync fix for bug #72910 with current upstream
| * Sync fix for bug #72910 with current upstreamStanislav Malyshev2016-09-041-3/+5
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-041-0/+17
|\ \ | |/
| * Fix #72994: mbc_to_code() out of bounds readChristoph M. Becker2016-09-042-1/+22
| | | | | | | | We're backporting commit 999a3553 to the still supported PHP 5.6.
* | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-09-011-1/+1
|\ \ | |/ | | | | | | | | * PHP-5.6: Fix bug #72910 5.6.27 will be next
| * Fix bug #72910Stanislav Malyshev2016-09-011-1/+1
| | | | | | | | Merge upstream patch from https://github.com/kkos/oniguruma/commit/65bdf2a0d160d06556415e5f396a75f6b11bad5c
* | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-08-302-0/+30
|\ \ | |/
| * Fix #66797: mb_substr only takes 32-bit signed integerChristoph M. Becker2016-08-302-0/+30
| | | | | | | | | | | | `from` and `len` are `long`, but get passed to mbfl_substr() which expects `int`s. Therefore we clamp the values to avoid the undefined conversion behavior.
* | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-302-1/+13
|\ \ | |/
| * fixes bad address given to onig_error_code_to_strju1ius2016-07-302-1/+13
| | | | | | | | | | | | Closes bug #72710 (cherry picked from commit 0fb7eb6723bcc6fd98053911543e801edb5ab763)
* | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-282-1/+22
|\ \ | |/ | | | | | | # Resolved conflicts: # ext/mbstring/php_mbregex.c
| * Fix #72694: mb_ereg_search_setpos does not accept a string's last positionChristoph M. Becker2016-07-282-1/+22
| | | | | | | | | | Setting the search position immediately behind the last character should be allowed, so we fix this off-by-one error.
* | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-283-5/+46
|\ \ | |/
| * Fix #72693: mb_ereg_search increments search position when a match zero-widthChristoph M. Becker2016-07-283-5/+46
| | | | | | | | That's caused by an off-by-one error, which we fix.
* | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-282-3/+48
|\ \ | |/ | | | | | | # Resolved conflicts: # ext/mbstring/php_mbregex.c
| * Fix #72691: mb_ereg_search raises a warning if a match zero-widthChristoph M. Becker2016-07-282-3/+48
| | | | | | | | | | That warning doesn't make sense (PCRE doesn't throw such a warning either), so we remove it.
* | Merge branch 'PHP-7.0.8' into PHP-7.0Stanislav Malyshev2016-06-212-1/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0.8: 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 Conflicts: configure.in main/php_version.h
| * \ Merge branch 'PHP-5.6.23' into PHP-7.0.8Stanislav Malyshev2016-06-212-1/+17
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * Merge branch 'PHP-5.5' into PHP-5.6.23Stanislav Malyshev2016-06-212-33/+49
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed 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 Skip test which is 64bits only 5.5.37 now Conflicts: configure.in ext/mcrypt/mcrypt.c ext/spl/spl_directory.c main/php_version.h
| | | * Fix bug #72402: _php_mb_regex_ereg_replace_exec - double freeStanislav Malyshev2016-06-182-33/+49
| | | |
* | | | Fixed(attempt to) bug #72405 (mb_ereg_replace - mbc_to_code (oniguruma) - ↵Xinchen Hui2016-06-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | oob read access) according to ext/mbstring/oniguruma/enc/utf8.c, max bytes are 6
* | | | Fixed bug #72399 (Use-After-Free in MBString (search_re))Xinchen Hui2016-06-132-1/+15
|/ / /
* | | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-06-061-0/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: missing return
| * | missing returnAnatol Belski2016-06-061-0/+2
| | |
| * | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2016-03-281-17/+17
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if ↵Yasuo Ohgaki2016-01-181-1/+1
| | | | | | | | | | | | test
* | | Fixed bug #72164 (Null Pointer Dereference - mb_ereg_replace)Xinchen Hui2016-05-052-6/+26
| | |
* | | Merge branch 'PHP-5.5' into PHP-7.0.5Stanislav Malyshev2016-03-281-4/+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
| * | Fixed bug #71906: AddressSanitizer: negative-size-param (-1) in mbfl_strcutStanislav Malyshev2016-03-281-17/+17
| | |
| * | added missing parenthesesMasaki Kagaya2015-03-082-1/+13
| | | | | | | | | | | | | | | | | | | | | added test case for bug #68846 replaced tab with space added missing parentheses again See also: http://icu-project.org/docs/papers/gb18030.html#h7
| * | Bump yearXinchen Hui2015-01-157-7/+7
| | |
* | | fix incompatible pointers on 64-bitAnatol Belski2016-03-071-29/+172
| | |
* | | Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-032-2/+2
| | | | | | | | | | | | Also re bug #71575.
* | | Merge branch 'PHP-5.6' into PHP-7.0Yasuo Ohgaki2016-01-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * PHP-5.6: Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if test
| * | | Fixed bug #65720 ext/mbstring/libmbfl/filters/mbfilter_cp5022x.c:281: bad if ↵Yasuo Ohgaki2016-01-181-1/+1
| | |/ | |/| | | | | | | test
* | | Fixed bug 71397 (mb_send_mail segmentation fault)Tim Düsterhus2016-01-171-1/+2
| | |
View Lorry Controller Status