delta/php-git.git/ext/mbstring, branch php-7.0.11

Merge branch 'PHP-5.6' into PHP-7.0

2016-07-30T10:01:29+00:00

fixes bad address given to onig_error_code_to_str

2016-07-30T09:46:34+00:00

Closes bug #72710

(cherry picked from commit 0fb7eb6723bcc6fd98053911543e801edb5ab763)

Merge branch 'PHP-5.6' into PHP-7.0

2016-07-28T13:26:29+00:00

# Resolved conflicts:
#	ext/mbstring/php_mbregex.c

Fix #72694: mb_ereg_search_setpos does not accept a string's last position

2016-07-28T13:21:48+00:00

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.0

2016-07-28T12:03:40+00:00

Fix #72693: mb_ereg_search increments search position when a match zero-width

2016-07-28T11:57:38+00:00

That's caused by an off-by-one error, which we fix.

Merge branch 'PHP-5.6' into PHP-7.0

2016-07-28T11:12:40+00:00

# Resolved conflicts:
#	ext/mbstring/php_mbregex.c

Fix #72691: mb_ereg_search raises a warning if a match zero-width

2016-07-28T11:07:05+00:00

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.0

2016-06-21T07:25:49+00:00

* 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.8

2016-06-21T07:24:32+00:00

* 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