]> granicus.if.org Git - php/log
php
8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Tue, 21 Jun 2016 11:26:34 +0000 (13:26 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix leak

8 years agofix leak
Anatol Belski [Tue, 21 Jun 2016 11:26:12 +0000 (13:26 +0200)]
fix leak

8 years agofix leak
Anatol Belski [Tue, 21 Jun 2016 10:29:41 +0000 (12:29 +0200)]
fix leak

8 years agobump zip version
Remi Collet [Tue, 21 Jun 2016 09:16:21 +0000 (11:16 +0200)]
bump zip version

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Tue, 21 Jun 2016 07:54:34 +0000 (09:54 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  remove the huge test file, generate it on the fly instead
  remove the huge test file, generate it on the fly instead

8 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Tue, 21 Jun 2016 07:53:04 +0000 (09:53 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  remove the huge test file, generate it on the fly instead

8 years agoremove the huge test file, generate it on the fly instead
Anatol Belski [Tue, 21 Jun 2016 07:42:38 +0000 (09:42 +0200)]
remove the huge test file, generate it on the fly instead

8 years agoremove the huge test file, generate it on the fly instead
Anatol Belski [Tue, 21 Jun 2016 07:42:38 +0000 (09:42 +0200)]
remove the huge test file, generate it on the fly instead

8 years agoremove the huge test file, generate it on the fly instead
Anatol Belski [Tue, 21 Jun 2016 07:42:38 +0000 (09:42 +0200)]
remove the huge test file, generate it on the fly instead

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Tue, 21 Jun 2016 07:28:17 +0000 (00:28 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Now the right bug #
  Fix NEWS

Conflicts:
configure.in
main/php_version.h

8 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Tue, 21 Jun 2016 07:27:46 +0000 (00:27 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Now the right bug #
  Fix NEWS

8 years agoMerge branch 'PHP-7.0.8' into PHP-7.0
Stanislav Malyshev [Tue, 21 Jun 2016 07:25:49 +0000 (00:25 -0700)]
Merge branch 'PHP-7.0.8' into PHP-7.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

8 years agoMerge branch 'PHP-5.6.23' into PHP-7.0.8
Stanislav Malyshev [Tue, 21 Jun 2016 07:24:32 +0000 (00:24 -0700)]
Merge branch 'PHP-5.6.23' into PHP-7.0.8

* 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

8 years agoNow the right bug #
Stanislav Malyshev [Tue, 21 Jun 2016 07:18:27 +0000 (00:18 -0700)]
Now the right bug #

8 years agoFix NEWS
Stanislav Malyshev [Tue, 21 Jun 2016 07:14:50 +0000 (00:14 -0700)]
Fix NEWS

8 years agoMerge branch 'PHP-5.6.23' into PHP-5.6
Stanislav Malyshev [Tue, 21 Jun 2016 07:02:37 +0000 (00:02 -0700)]
Merge branch 'PHP-5.6.23' into PHP-5.6

* PHP-5.6.23:
  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
  Fix bug #72321 - use efree() for emalloc allocation
  5.6.23RC1

Conflicts:
configure.in
main/php_version.h

8 years agoMerge branch 'PHP-5.5' into PHP-5.6.23
Stanislav Malyshev [Tue, 21 Jun 2016 07:01:48 +0000 (00:01 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6.23

* 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

8 years agoiFixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in...
Stanislav Malyshev [Tue, 21 Jun 2016 06:58:26 +0000 (23:58 -0700)]
iFixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow

8 years agoupdate NEWS
Stanislav Malyshev [Tue, 21 Jun 2016 06:45:37 +0000 (23:45 -0700)]
update NEWS

8 years agoMerge branch 'PHP-5.5.37' into PHP-5.5
Stanislav Malyshev [Tue, 21 Jun 2016 06:31:54 +0000 (23:31 -0700)]
Merge branch 'PHP-5.5.37' into PHP-5.5

* PHP-5.5.37:
  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

8 years agofix tests
Stanislav Malyshev [Tue, 21 Jun 2016 05:54:55 +0000 (22:54 -0700)]
fix tests

8 years agofix build
Stanislav Malyshev [Tue, 21 Jun 2016 05:13:31 +0000 (22:13 -0700)]
fix build

8 years agoFix bug #72455: Heap Overflow due to integer overflows
Stanislav Malyshev [Tue, 21 Jun 2016 04:51:42 +0000 (21:51 -0700)]
Fix bug #72455:  Heap Overflow due to integer overflows

8 years agoFix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm...
Stanislav Malyshev [Tue, 21 Jun 2016 04:35:22 +0000 (21:35 -0700)]
Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize

8 years agoFixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize
Stanislav Malyshev [Tue, 21 Jun 2016 04:26:33 +0000 (21:26 -0700)]
Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Remi Collet [Mon, 20 Jun 2016 16:44:39 +0000 (18:44 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix bug #71936 (Segmentation fault destroying HTTP_RAW_POST_DATA)

8 years agoFix bug #71936 (Segmentation fault destroying HTTP_RAW_POST_DATA)
Remi Collet [Mon, 20 Jun 2016 16:43:07 +0000 (18:43 +0200)]
Fix bug #71936 (Segmentation fault destroying HTTP_RAW_POST_DATA)

8 years agoUpdate NEWS
Christoph M. Becker [Mon, 20 Jun 2016 13:28:41 +0000 (15:28 +0200)]
Update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 20 Jun 2016 13:20:58 +0000 (15:20 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoUpdate NEWS
Christoph M. Becker [Mon, 20 Jun 2016 13:18:47 +0000 (15:18 +0200)]
Update NEWS

8 years agoFix #64641: imagefilledpolygon doesn't draw horizontal line
Christoph M. Becker [Sun, 19 Jun 2016 11:54:55 +0000 (13:54 +0200)]
Fix #64641: imagefilledpolygon doesn't draw horizontal line

As has been reported, 1-dimensional horizontal filled polygons are not drawn
at all. That is caused by the scanline algorithm used for drawing filled
polygons which skips the drawing of horizontal edges, because that is
normally not necessary. If, however, the polygon consists of horizontal
edges only, that obviously doesn't work, so we add a special case handling.

That has also been fixed in libgd with
<https://github.com/libgd/libgd/commit/f9f10fa9>.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Sun, 19 Jun 2016 05:13:16 +0000 (22:13 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Update NEWS

8 years agoUpdate NEWS
Stanislav Malyshev [Sun, 19 Jun 2016 05:13:04 +0000 (22:13 -0700)]
Update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Sun, 19 Jun 2016 05:11:23 +0000 (22:11 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix bug #72447: Type Confusion in php_bz2_filter_create()

Conflicts:
ext/bz2/bz2_filter.c

8 years agoFix bug #72447: Type Confusion in php_bz2_filter_create()
Stanislav Malyshev [Sun, 19 Jun 2016 05:10:22 +0000 (22:10 -0700)]
Fix bug #72447: Type Confusion in php_bz2_filter_create()

8 years agoFix bug #72407: NULL Pointer Dereference at _gdScaleVert
Stanislav Malyshev [Sun, 19 Jun 2016 04:57:25 +0000 (21:57 -0700)]
Fix bug #72407: NULL Pointer Dereference at _gdScaleVert

8 years agoFix bug #72402: _php_mb_regex_ereg_replace_exec - double free
Stanislav Malyshev [Sun, 19 Jun 2016 04:48:39 +0000 (21:48 -0700)]
Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free

8 years agoUpdate NEWS
Xinchen Hui [Sun, 19 Jun 2016 04:34:12 +0000 (21:34 -0700)]
Update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Sun, 19 Jun 2016 04:33:54 +0000 (21:33 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
main/streams/xp_socket.c

8 years agoFixed bug #72439 (Stream socket with remote address leads to a segmentation fault)
Xinchen Hui [Sun, 19 Jun 2016 04:29:47 +0000 (21:29 -0700)]
Fixed bug #72439 (Stream socket with remote address leads to a segmentation fault)

8 years agoFix bug #72298 pass2_no_dither out-of-bounds access
Stanislav Malyshev [Sun, 19 Jun 2016 04:04:33 +0000 (21:04 -0700)]
Fix bug #72298 pass2_no_dither out-of-bounds access

8 years agoFixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow
Pierre Joye [Sat, 18 Jun 2016 18:15:10 +0000 (20:15 +0200)]
Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow

8 years agoUpdate NEWS
Christoph M. Becker [Fri, 17 Jun 2016 16:00:24 +0000 (18:00 +0200)]
Update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 17 Jun 2016 15:52:10 +0000 (17:52 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #53640: XBM images require width to be multiple of 8
Christoph M. Becker [Fri, 17 Jun 2016 15:50:36 +0000 (17:50 +0200)]
Fix #53640: XBM images require width to be multiple of 8

8 years agoFixed "implicit declaration of function ‘msgformat_fix_quotes’"
Xinchen Hui [Fri, 17 Jun 2016 07:59:41 +0000 (15:59 +0800)]
Fixed "implicit declaration of function ‘msgformat_fix_quotes’"

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Jakub Zelenka [Thu, 16 Jun 2016 19:11:54 +0000 (20:11 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix incorrect error suppressing in openssl_error_string test
Jakub Zelenka [Thu, 16 Jun 2016 19:11:02 +0000 (20:11 +0100)]
Fix incorrect error suppressing in openssl_error_string test

8 years agoFix occasionally failing OpenSSL DH bug test
Jakub Zelenka [Thu, 16 Jun 2016 19:09:17 +0000 (20:09 +0100)]
Fix occasionally failing OpenSSL DH bug test

The test was failing when first byte was 0

8 years agoUpdate NEWS
Christoph M. Becker [Thu, 16 Jun 2016 12:33:41 +0000 (14:33 +0200)]
Update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 16 Jun 2016 12:32:10 +0000 (14:32 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoUpdate NEWS
Christoph M. Becker [Thu, 16 Jun 2016 12:26:45 +0000 (14:26 +0200)]
Update NEWS

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 16 Jun 2016 12:06:39 +0000 (14:06 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #43475: Styled thick horizontal lines are scrambled
Christoph M. Becker [Wed, 15 Jun 2016 18:58:06 +0000 (20:58 +0200)]
Fix #43475: Styled thick horizontal lines are scrambled

Thick lines are drawn by gdImageFilledRectangle(), which iterates over
the x ordinate first (Z order) to apply the style pattern. While this works
fine for vertical and diagonal lines, it obviously fails for horizontal
lines, which have to be iterated over in N order.

To fix this bug, we introduce the helpers  gdImageFilled(H|V)Rectangle(),
which may be reused for other purposes as well.

This is basically the same fix as libgd/libgd/c2b91dbc.

8 years agoFix bug #72262 - do not overflow int
Stanislav Malyshev [Thu, 16 Jun 2016 04:58:26 +0000 (21:58 -0700)]
Fix bug #72262 - do not overflow int

8 years agoFix bug #72400 and #72403 - prevent signed int overflows for string lengths
Stanislav Malyshev [Thu, 16 Jun 2016 04:46:46 +0000 (21:46 -0700)]
Fix bug #72400 and #72403 - prevent signed int overflows for string lengths

8 years agoFixed expected test outcome due to rule changes
Derick Rethans [Wed, 15 Jun 2016 17:31:41 +0000 (18:31 +0100)]
Fixed expected test outcome due to rule changes

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Derick Rethans [Wed, 15 Jun 2016 17:30:03 +0000 (18:30 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFixed expected test outcome due to rule changes
Derick Rethans [Wed, 15 Jun 2016 17:29:40 +0000 (18:29 +0100)]
Fixed expected test outcome due to rule changes

8 years agoUpdated to version 2016.5 (2016e)
Derick Rethans [Wed, 15 Jun 2016 10:58:50 +0000 (11:58 +0100)]
Updated to version 2016.5 (2016e)

8 years agoEmpty merge
Derick Rethans [Wed, 15 Jun 2016 10:58:49 +0000 (11:58 +0100)]
Empty merge

8 years agoUpdated to version 2016.5 (2016e)
Derick Rethans [Wed, 15 Jun 2016 10:58:47 +0000 (11:58 +0100)]
Updated to version 2016.5 (2016e)

8 years agoMerge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Wed, 15 Jun 2016 06:56:07 +0000 (14:56 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:/php-src:
  Maybe fix bug #72011
  Fix #50845: exif_process_IFD_TAG: Use the right offset if reading from stream
  Fix bug #72138 - Integer Overflow in Length of String-typed ZVAL

8 years agoFixed(attempt to) bug #72405 (mb_ereg_replace - mbc_to_code (oniguruma) - oob read...
Xinchen Hui [Wed, 15 Jun 2016 06:54:57 +0000 (14:54 +0800)]
Fixed(attempt to) bug #72405 (mb_ereg_replace - mbc_to_code (oniguruma) - oob read access)

according to ext/mbstring/oniguruma/enc/utf8.c, max bytes are 6

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Tue, 14 Jun 2016 20:38:44 +0000 (22:38 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/date/php_date.c

8 years agoMaybe fix bug #72011
Nikita Popov [Tue, 14 Jun 2016 20:36:09 +0000 (22:36 +0200)]
Maybe fix bug #72011

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Tue, 14 Jun 2016 17:50:45 +0000 (10:50 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix #50845: exif_process_IFD_TAG: Use the right offset if reading from stream

8 years agoFix #50845: exif_process_IFD_TAG: Use the right offset if reading from stream
Bartosz Dziewoński [Tue, 14 Jun 2016 11:27:56 +0000 (13:27 +0200)]
Fix #50845: exif_process_IFD_TAG: Use the right offset if reading from stream

When the location of the data is outside of the range we have
preloaded (for example, if it's before the beginning of the IFD
structure), we have to read it from the stream into a separate buffer.
The offset calculations in this case were incorrect, resulting in
bogus values being read for the affected fields (sometimes parts of
other fields, sometimes binary data).

The included test image, sourced from [1], is in the public domain.

[1] https://commons.wikimedia.org/wiki/File:U.S._Marines_Prepare_to_board_an_MV-22_Osprey_160509-M-AF202-041.jpg

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Tue, 14 Jun 2016 08:03:37 +0000 (01:03 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix bug #72138 - Integer Overflow in Length of String-typed ZVAL

8 years agoFix bug #72138 - Integer Overflow in Length of String-typed ZVAL
Stanislav Malyshev [Tue, 14 Jun 2016 08:03:03 +0000 (01:03 -0700)]
Fix bug #72138 - Integer Overflow in Length of String-typed ZVAL

8 years agoFix bug #72275: don't allow smart_str to overflow int
Stanislav Malyshev [Tue, 14 Jun 2016 06:12:47 +0000 (23:12 -0700)]
Fix bug #72275: don't allow smart_str to overflow int

8 years agoFixed bug #72399 (Use-After-Free in MBString (search_re))
Xinchen Hui [Tue, 14 Jun 2016 01:20:26 +0000 (18:20 -0700)]
Fixed bug #72399 (Use-After-Free in MBString (search_re))

8 years agoFixed bug #72306 (Heap overflow through proc_open and $env parameter)
Xinchen Hui [Mon, 13 Jun 2016 13:08:04 +0000 (21:08 +0800)]
Fixed bug #72306 (Heap overflow through proc_open and $env parameter)

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Mon, 13 Jun 2016 06:19:19 +0000 (08:19 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS
  Fix #66387: Stack overflow with imagefilltoborder
  Skip test which is 64bits only
  5.5.37 now

8 years agoFix bug #72340: Double Free Courruption in wddx_deserialize
Stanislav Malyshev [Mon, 13 Jun 2016 06:18:23 +0000 (23:18 -0700)]
Fix bug #72340: Double Free Courruption in wddx_deserialize

8 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Mon, 13 Jun 2016 06:15:31 +0000 (08:15 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  Fix #66387: Stack overflow with imagefilltoborder
  Skip test which is 64bits only
  5.5.37 now

8 years agoupdate NEWS
Anatol Belski [Mon, 13 Jun 2016 06:12:22 +0000 (08:12 +0200)]
update NEWS

8 years agoFix #66387: Stack overflow with imagefilltoborder
Christoph M. Becker [Mon, 20 Jul 2015 21:24:55 +0000 (23:24 +0200)]
Fix #66387: Stack overflow with imagefilltoborder

The stack overflow is caused by the recursive algorithm in combination with a
very large negative coordinate passed to gdImageFillToBorder(). As there is
already a clipping for large positive coordinates to the width and height of
the image, it seems to be consequent to clip to zero also.

8 years agoFix bug #72321 - use efree() for emalloc allocation
Stanislav Malyshev [Sun, 12 Jun 2016 23:43:12 +0000 (16:43 -0700)]
Fix bug #72321 - use efree() for emalloc allocation

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Jakub Zelenka [Sun, 12 Jun 2016 17:39:32 +0000 (18:39 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix bug #71915 (openssl_random_pseudo_bytes is not fork-safe)
Jakub Zelenka [Sun, 12 Jun 2016 17:11:38 +0000 (18:11 +0100)]
Fix bug #71915 (openssl_random_pseudo_bytes is not fork-safe)

Add time to the entropy before using RAND_bytes

8 years agoFix bug #72336 (openssl_pkey_new does not fail for invalid DSA params)
Jakub Zelenka [Sun, 12 Jun 2016 16:57:08 +0000 (17:57 +0100)]
Fix bug #72336 (openssl_pkey_new does not fail for invalid DSA params)

8 years agoUpdate openssl_error_string to run and be more forgiving
Jakub Zelenka [Sun, 12 Jun 2016 16:54:37 +0000 (17:54 +0100)]
Update openssl_error_string to run and be more forgiving

8 years agoFix #71554: FTP has not built-in support
Christoph M. Becker [Sun, 12 Jun 2016 11:22:02 +0000 (13:22 +0200)]
Fix #71554: FTP has not built-in support

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 9 Jun 2016 13:35:28 +0000 (15:35 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoMerge branch 'pull-request/1930' into PHP-5.6
Christoph M. Becker [Thu, 9 Jun 2016 13:28:58 +0000 (15:28 +0200)]
Merge branch 'pull-request/1930' into PHP-5.6

8 years agoFixed bug #72369 (array_merge() produces references in PHP7)
Dmitry Stogov [Thu, 9 Jun 2016 12:07:44 +0000 (15:07 +0300)]
Fixed bug #72369 (array_merge() produces references in PHP7)

8 years ago5.6.23RC1 php-5.6.23RC1
Ferenc Kovacs [Thu, 9 Jun 2016 08:54:35 +0000 (10:54 +0200)]
5.6.23RC1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Thu, 9 Jun 2016 08:52:26 +0000 (10:52 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  5.6.24 will be next

8 years ago5.6.24 will be next
Ferenc Kovacs [Thu, 9 Jun 2016 08:51:02 +0000 (10:51 +0200)]
5.6.24 will be next

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Jakub Zelenka [Wed, 8 Jun 2016 17:36:36 +0000 (18:36 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix bug #72140 (segfault after calling ERR_free_strings())
Jakub Zelenka [Wed, 8 Jun 2016 17:21:39 +0000 (18:21 +0100)]
Fix bug #72140 (segfault after calling ERR_free_strings())

8 years agoMerge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
Pierre Joye [Wed, 8 Jun 2016 04:08:05 +0000 (11:08 +0700)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Pierre Joye [Wed, 8 Jun 2016 04:07:32 +0000 (11:07 +0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  prevent invalid color index (palette only), may lead to crash
  Add CVE to #66387
  add missing NEWS entry

8 years agoprevent invalid color index (palette only), may lead to crash
Pierre Joye [Wed, 8 Jun 2016 04:06:48 +0000 (11:06 +0700)]
prevent invalid color index (palette only), may lead to crash

8 years agoAdd CVE to #66387
Lior Kaplan [Tue, 7 Jun 2016 18:46:59 +0000 (21:46 +0300)]
Add CVE to #66387

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Lior Kaplan [Tue, 7 Jun 2016 18:46:25 +0000 (21:46 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Add CVE to #66387

8 years agoAdd CVE to #66387
Lior Kaplan [Tue, 7 Jun 2016 18:45:24 +0000 (21:45 +0300)]
Add CVE to #66387

8 years agofix NEWS php-7.0.8RC1
Anatol Belski [Tue, 7 Jun 2016 16:53:18 +0000 (18:53 +0200)]
fix NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.0.8
Anatol Belski [Tue, 7 Jun 2016 16:51:34 +0000 (18:51 +0200)]
Merge branch 'PHP-7.0' into PHP-7.0.8

* PHP-7.0:
  fix NEWS
  add missing NEWS entry
  update NEWS
  #72337 invalid dimensions can lead to segv
  7.0.9 next

Conflicts:
configure.in
main/php_version.h