summaryrefslogtreecommitdiff
path: root/ext/mbstring/php_mbregex.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-281-1/+1
|\ \ \ | |/ / | | | | | | | | | # Resolved conflicts: # ext/mbstring/php_mbregex.c
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-281-1/+1
| |\ \ | | |/ | | | | | | | | | # Resolved conflicts: # ext/mbstring/php_mbregex.c
| | * Fix #72694: mb_ereg_search_setpos does not accept a string's last positionChristoph M. Becker2016-07-281-1/+1
| | | | | | | | | | | | | | | Setting the search position immediately behind the last character should be allowed, so we fix this off-by-one error.
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-281-1/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-281-1/+1
| |\ \ | | |/
| | * Fix #72693: mb_ereg_search increments search position when a match zero-widthChristoph M. Becker2016-07-281-1/+1
| | | | | | | | | | | | That's caused by an off-by-one error, which we fix.
* | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-07-281-3/+0
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-07-281-3/+0
| |\ \ | | |/ | | | | | | | | | # Resolved conflicts: # ext/mbstring/php_mbregex.c
| | * Fix #72691: mb_ereg_search raises a warning if a match zero-widthChristoph M. Becker2016-07-281-3/+0
| | | | | | | | | | | | | | | That warning doesn't make sense (PCRE doesn't throw such a warning either), so we remove it.
* | | check the encoding of argument for mb_ereg, mb_ereg_replace, mb_ereg_search_initMasaki Kagaya2016-07-171-3/+29
| | |
* | | Implement RFC "Deprecate mb_ereg_replace eval option"Christoph M. Becker2016-07-111-0/+3
| | | | | | | | | | | | | | | <https://wiki.php.net/rfc/deprecate_mb_ereg_replace_eval_option> has been accepted, so we implement it.
* | | Merge branch 'throw-error-in-extensions'Aaron Piotrowski2016-07-051-2/+5
|\ \ \
| * | | Replace zend_ce_error with NULL and replace more E_ERROR with thrown ErrorAaron Piotrowski2016-06-131-2/+4
| | | |
| * | | Merge branch 'master' into throw-error-in-extensionsAaron Piotrowski2016-06-101-26/+30
| |\ \ \
| * | | | Update memory freeing and other issues, revert some changesAaron Piotrowski2015-07-051-1/+3
| | | | |
| * | | | Convert E_ERROR to thrown Error in extensionsAaron Piotrowski2015-07-051-2/+4
| | | | |
* | | | | Fixed compilation warningsDmitry Stogov2016-06-221-4/+5
| | | | |
* | | | | Merge branch 'PHP-7.0'Stanislav Malyshev2016-06-211-1/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-7.0.8' into PHP-7.0Stanislav Malyshev2016-06-211-1/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-211-1/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-211-33/+32
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-181-33/+32
| | | | | | |
| | | | * | | Bump yearXinchen Hui2015-01-151-1/+1
| | | | | | |
| | | | * | | Bump yearXinchen Hui2014-01-031-1/+1
| | | | | | |
* | | | | | | Merge branch 'PHP-7.0'Xinchen Hui2016-06-151-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: Fixed(attempt to) bug #72405 (mb_ereg_replace - mbc_to_code (oniguruma) - oob read access)
| * | | | | | 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
* | | | | | | Merge branch 'PHP-7.0'Xinchen Hui2016-06-131-1/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | Fixed bug #72399 (Use-After-Free in MBString (search_re))Xinchen Hui2016-06-131-1/+5
| |/ / / /
* | | | | Merge branch 'PHP-7.0'Xinchen Hui2016-05-051-6/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-7.0: Fixed bug #72164 (Null Pointer Dereference - mb_ereg_replace)
| * | | | Fixed bug #72164 (Null Pointer Dereference - mb_ereg_replace)Xinchen Hui2016-05-051-6/+12
| | | | |
* | | | | mb_ereg_search_setpos(): Add support for negative positionFrancois Laupretre2016-03-091-0/+5
|/ / / / | | | | | | | | | | | | Also add missing test for this function
* | | | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-011-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * | | Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
| | | |
| * | | bump yearXinchen Hui2015-01-151-1/+1
| | | |
* | | | Fix/improve zpp usageNikita Popov2015-10-021-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | The ext/interbase changes are done blindly, fingers crossed. Some of these are bug fixes, some make zpp usage more idiomatic.
* | | | Various warning fixesNikita Popov2015-07-171-3/+3
| |_|/ |/| |
* | | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-301-4/+4
| | | | | | | | | | | | semantick changes).
* | | Fixed valgrind issue in mb_ereg_replace_variation1.phptXinchen Hui2015-01-291-1/+3
| | |
* | | bump yearXinchen Hui2015-01-151-1/+1
| | |
* | | trailing whitespace removalStanislav Malyshev2015-01-101-28/+28
| | |
* | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-48/+48
| | |
* | | Review a few more SEPARATE_ZVAL_IF_NOT_REF usagesNikita Popov2014-10-091-2/+1
| | |
* | | Move smart_str implementation into Zend/Nikita Popov2014-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just move that one struct into zend_types.h.
* | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
| | |
* | | simplify conditionAnatol Belski2014-09-191-1/+1
| | |
* | | fix empty string checkAnatol Belski2014-09-191-1/+1
| | |
* | | redo the fix casting to size_t where applicableAnatol Belski2014-09-161-1/+1
| | |
* | | fix signed/unsigned mismatch warningsAnatol Belski2014-09-161-2/+2
| | |
* | | 's' works with size_t round 3Anatol Belski2014-08-271-2/+2
| | |
* | | first show to make 's' work with size_tAnatol Belski2014-08-271-12/+12
| | |
View Lorry Controller Status