]> granicus.if.org Git - php/log
php
8 years agoMore type inference fixes
Nikita Popov [Thu, 16 Jun 2016 09:24:20 +0000 (11:24 +0200)]
More type inference fixes

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

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 agoAdded NEWS entries
Dmitry Stogov [Thu, 16 Jun 2016 05:44:38 +0000 (08:44 +0300)]
Added NEWS entries

8 years agoImplemented RFC: Replace "Missing argument" warning with "Too few arguments" exception
Dmitry Stogov [Wed, 15 Jun 2016 23:32:02 +0000 (02:32 +0300)]
Implemented RFC: Replace "Missing argument" warning with "Too few arguments" exception
Squashed commit of the following:

commit 8b45fa2acb8cd92542a39e1e4720fe1f4fabc26c
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Jun 16 01:52:50 2016 +0300

    Separate slow path of ZEND_RECV into a cold function.

commit 9e18895ee59c64c93a96b1ba3061355c4663e962
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jun 15 23:26:28 2016 +0300

    Required argument can't be IS_UNDEF anymore.

commit 662db66e3943d4455c65e4f987bb54abf724ecb2
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue May 31 17:14:50 2016 +0300

    Replace "Missing argument" warning by "Too few arguments" exception.

8 years agoImplemented RFC: Fix inconsistent behavior of $this variable
Dmitry Stogov [Wed, 15 Jun 2016 23:30:23 +0000 (02:30 +0300)]
Implemented RFC: Fix inconsistent behavior of $this variable
Squashed commit of the following:

commit bdd3b6895c3ce3eacfcf7d4bf4feb8dfa61801fd
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Jun 16 00:19:42 2016 +0300

    Fixed GOTO VM

commit 2f1d7c8b89ce821086d357cf65f629f040a85c03
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jun 15 21:01:57 2016 +0300

    Removed unused variable

commit cf749c42b0b1919f70b1e7d6dcbfff76899506af
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jun 15 19:06:16 2016 +0300

    Protection from $this reassign through mb_parse_str()

commit 59a9a6c83c66b666971e57f1173b33a422166efd
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jun 15 18:14:50 2016 +0300

    Added type inference rule for FETCH_THIS opcode

commit 73f8d14a856f14a461430b3c7534ab2ce870cbf6
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jun 15 18:11:18 2016 +0300

    Restored PHP-7 behavior of isset($this->foo).
    It throws exception if not in object context.
    Removed useless opcode handlers.

commit fa0881381e8ae97e022ae5d1ec0851c952f33c82
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue May 31 12:25:47 2016 +0300

    Changed "Notice: Undefined variable: this" into "Exception: Using $this when not in object context".

commit e32cc528c0f2c97963d8ec83eff0269f1f45af18
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Tue May 24 02:02:43 2016 +0300

    Throw exception on attempt to re-assign $this through extract() and parse_str().

commit 41f1531b52113ec8a4c208aa6b9ef50f1386bb3f
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Mon May 23 22:18:36 2016 +0300

    Fixed inconsistent $this behavior

8 years agoFix type inference bugs
Nikita Popov [Wed, 8 Jun 2016 20:21:36 +0000 (22:21 +0200)]
Fix type inference bugs

* Add proper array_key_any|array_of_any|array_of_ref in some more
  places
* strlen() on objects may be null
* IS fetch on string dim may be null

8 years agoAdded specialized handlers for SEND_VAR/SEND_VAR_EX opcodes.
Dmitry Stogov [Wed, 15 Jun 2016 20:07:46 +0000 (23:07 +0300)]
Added specialized handlers for SEND_VAR/SEND_VAR_EX opcodes.

8 years agoFixed mistakes in type inference rules.
Dmitry Stogov [Wed, 15 Jun 2016 20:04:17 +0000 (23:04 +0300)]
Fixed mistakes in type inference rules.

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-7.0'
Derick Rethans [Wed, 15 Jun 2016 17:30:19 +0000 (18:30 +0100)]
Merge branch 'PHP-7.0'

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:51 +0000 (11:58 +0100)]
Updated to version 2016.5 (2016e)

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

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'
Xinchen Hui [Wed, 15 Jun 2016 06:56:58 +0000 (14:56 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:

8 years agoThese bugs are also in 7.1-alpha
Xinchen Hui [Wed, 15 Jun 2016 06:56:41 +0000 (14:56 +0800)]
These bugs are also in 7.1-alpha

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 agoMerge branch 'PHP-7.0'
Xinchen Hui [Wed, 15 Jun 2016 06:55:43 +0000 (14:55 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed(attempt to) bug #72405 (mb_ereg_replace - mbc_to_code (oniguruma) - oob read access)

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-7.0'
Nikita Popov [Tue, 14 Jun 2016 20:39:18 +0000 (22:39 +0200)]
Merge branch 'PHP-7.0'

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-7.0'
Stanislav Malyshev [Tue, 14 Jun 2016 17:51:02 +0000 (10:51 -0700)]
Merge branch 'PHP-7.0'

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

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 agoImprove the signature
Xinchen Hui [Tue, 14 Jun 2016 15:05:17 +0000 (08:05 -0700)]
Improve the signature

8 years agoUnused var
Xinchen Hui [Tue, 14 Jun 2016 13:29:02 +0000 (21:29 +0800)]
Unused var

8 years agoMerge branch 'master' of git.php.net:/php-src
Xinchen Hui [Tue, 14 Jun 2016 10:20:23 +0000 (18:20 +0800)]
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Fix bug #72138 - Integer Overflow in Length of String-typed ZVAL

8 years agoC89 compatibility
Xinchen Hui [Tue, 14 Jun 2016 10:17:49 +0000 (18:17 +0800)]
C89 compatibility

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

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

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 agoOnly allow single comma in tail
Xinchen Hui [Tue, 14 Jun 2016 06:02:34 +0000 (14:02 +0800)]
Only allow single comma in tail

8 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Tue, 14 Jun 2016 01:20:37 +0000 (18:20 -0700)]
Merge branch 'PHP-7.0'

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 agoImplemented FR #72385 (Update SQLite bundle lib(3.13.0))
Xinchen Hui [Tue, 14 Jun 2016 00:53:31 +0000 (17:53 -0700)]
Implemented FR #72385 (Update SQLite bundle lib(3.13.0))

8 years agoMerge branch 'master' of git.php.net:/php-src
Xinchen Hui [Tue, 14 Jun 2016 00:36:26 +0000 (17:36 -0700)]
Merge branch 'master' of git.php.net:/php-src

8 years agoCleanup
Xinchen Hui [Tue, 14 Jun 2016 00:36:03 +0000 (17:36 -0700)]
Cleanup

8 years agoAdd support for "instanceof" pi nodes
Nikita Popov [Tue, 7 Jun 2016 19:52:47 +0000 (21:52 +0200)]
Add support for "instanceof" pi nodes

8 years agoUse union for pi constraints
Nikita Popov [Tue, 7 Jun 2016 19:16:29 +0000 (21:16 +0200)]
Use union for pi constraints

This will make it easier to extend pi constraints without impacting
structure sizes.

8 years agoCleanup
Xinchen Hui [Mon, 13 Jun 2016 16:33:19 +0000 (09:33 -0700)]
Cleanup

8 years agoMerge branch 'master' of git.php.net:/php-src
Xinchen Hui [Mon, 13 Jun 2016 16:21:34 +0000 (09:21 -0700)]
Merge branch 'master' of git.php.net:/php-src

8 years agoFixed bug #72395 (list() regression)
Xinchen Hui [Mon, 13 Jun 2016 16:21:14 +0000 (09:21 -0700)]
Fixed bug #72395 (list() regression)

8 years agoSwitch zend_print_zval_r to use smart_str
Nikita Popov [Wed, 7 Oct 2015 09:35:43 +0000 (11:35 +0200)]
Switch zend_print_zval_r to use smart_str

Instead of directly writing to stdout. This allows doing a print_r
into a string, without using output buffering.

The motivation for this is bug #67467: print_r() in return mode
will still dump the string to stdout (causing a potential information
leak) if a fatal error occurs.

8 years agofix test portability
Anatol Belski [Mon, 13 Jun 2016 13:46:28 +0000 (15:46 +0200)]
fix test portability

8 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 13 Jun 2016 13:08:23 +0000 (21:08 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #72306 (Heap overflow through proc_open and $env parameter)

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-7.0'
Anatol Belski [Mon, 13 Jun 2016 06:20:11 +0000 (08:20 +0200)]
Merge branch 'PHP-7.0'

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

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 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 agoValue should not be a reference here
Xinchen Hui [Mon, 13 Jun 2016 05:40:53 +0000 (13:40 +0800)]
Value should not be a reference here

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

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 agoMerge branch 'PHP-7.0'
Christoph M. Becker [Sun, 12 Jun 2016 11:22:32 +0000 (13:22 +0200)]
Merge branch 'PHP-7.0'

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 agoEG(fake_scope) was always set to NULL wrongly
Xinchen Hui [Sun, 12 Jun 2016 07:17:03 +0000 (15:17 +0800)]
EG(fake_scope) was always set to NULL wrongly

8 years agocast const away
Xinchen Hui [Sat, 11 Jun 2016 08:11:40 +0000 (16:11 +0800)]
cast const away

8 years agoFixed bug #72373
Nikita Popov [Fri, 10 Jun 2016 13:57:18 +0000 (15:57 +0200)]
Fixed bug #72373

8 years agofix test out
Anatol Belski [Thu, 9 Jun 2016 18:16:09 +0000 (20:16 +0200)]
fix test out

8 years agofix test
Anatol Belski [Thu, 9 Jun 2016 18:12:49 +0000 (20:12 +0200)]
fix test

8 years agosync with deleted file
Anatol Belski [Thu, 9 Jun 2016 14:13:04 +0000 (16:13 +0200)]
sync with deleted file

8 years agofix tests
Anatol Belski [Thu, 9 Jun 2016 13:22:12 +0000 (15:22 +0200)]
fix tests

8 years agoadd flags to suppress the verbosity
Anatol Belski [Thu, 9 Jun 2016 11:39:19 +0000 (13:39 +0200)]
add flags to suppress the verbosity

8 years agoRequest #69489
Xinchen Hui [Tue, 21 Apr 2015 14:19:56 +0000 (22:19 +0800)]
Request #69489

8 years agoMerge branch 'pull-request/1912'
Christoph M. Becker [Thu, 9 Jun 2016 14:30:52 +0000 (16:30 +0200)]
Merge branch 'pull-request/1912'

8 years agoMerge branch 'master' of http://git.php.net/repository/php-src
Christoph M. Becker [Thu, 9 Jun 2016 13:58:09 +0000 (15:58 +0200)]
Merge branch 'master' of http://git.php.net/repository/php-src

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

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 agoOptimization
Dmitry Stogov [Thu, 9 Jun 2016 13:01:55 +0000 (16:01 +0300)]
Optimization

8 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Thu, 9 Jun 2016 12:09:09 +0000 (15:09 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #72369 (array_merge() produces references in PHP7)

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 agoDelay IS_ERROR checks
Dmitry Stogov [Thu, 9 Jun 2016 09:39:38 +0000 (12:39 +0300)]
Delay IS_ERROR checks

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

* PHP-7.0:
  5.6.24 will be next

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-7.0'
Jakub Zelenka [Wed, 8 Jun 2016 17:37:32 +0000 (18:37 +0100)]
Merge branch 'PHP-7.0'

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 agotypo
Dmitry Stogov [Wed, 8 Jun 2016 16:01:28 +0000 (19:01 +0300)]
typo

8 years agoFollowup for bug #53432
Nikita Popov [Wed, 8 Jun 2016 13:33:11 +0000 (15:33 +0200)]
Followup for bug #53432

Assign-ops and nested accesses now get the same treatment.

8 years agocleanup
Dmitry Stogov [Wed, 8 Jun 2016 09:55:31 +0000 (12:55 +0300)]
cleanup

8 years agoReplaced wrong check with proper ZEND_ASSERT()
Dmitry Stogov [Wed, 8 Jun 2016 09:11:47 +0000 (12:11 +0300)]
Replaced wrong check with proper ZEND_ASSERT()

8 years agoRemoved useless reference counting
Dmitry Stogov [Wed, 8 Jun 2016 08:24:53 +0000 (11:24 +0300)]
Removed useless reference counting

8 years agoThis test was fixed together with fix for bug #70228
Dmitry Stogov [Wed, 8 Jun 2016 08:14:06 +0000 (11:14 +0300)]
This test was fixed together with fix for bug #70228

8 years agofix php_log_err macro
Anatol Belski [Wed, 8 Jun 2016 06:10:09 +0000 (08:10 +0200)]
fix php_log_err macro

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

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

Conflicts:
NEWS

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