Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: (48 commits)
Update NEWs
Unused label
Fixed bug #72853 (stream_set_blocking doesn't work)
fix test
Bug #72663 - p

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: (48 commits)
Update NEWs
Unused label
Fixed bug #72853 (stream_set_blocking doesn't work)
fix test
Bug #72663 - part 3
Bug #72663 - part 2
Bug #72663 - part 1
Update NEWS
BLock test with memory leak
fix tests
Fix TSRM build
Fix bug #72850 - integer overflow in uuencode
Fixed bug #72849 - integer overflow in urlencode
Fix bug #72848 - integer overflow in quoted_printable_encode caused heap corruption
Fix bug #72838 - Integer overflow lead to heap corruption in sql_regcase
Fix bug #72837 - integer overflow in bzdecompress caused heap corruption
Fix bug #72836 - integer overflow in base64_decode caused heap corruption
Fix for bug #72807 - do not produce strings with negative length
Fix for bug #72790 and bug #72799
Fix bug #72730 - imagegammacorrect allows arbitrary write access
...

Conflicts:
ext/standard/var_unserializer.c

show more ...

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6: (24 commits)
Update NEWS
BLock test with memory leak
fix tests
Fix TSRM build
Fix bug #72850 - integer overflow i

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6: (24 commits)
Update NEWS
BLock test with memory leak
fix tests
Fix TSRM build
Fix bug #72850 - integer overflow in uuencode
Fixed bug #72849 - integer overflow in urlencode
Fix bug #72848 - integer overflow in quoted_printable_encode caused heap corruption
Fix bug #72838 - Integer overflow lead to heap corruption in sql_regcase
Fix bug #72837 - integer overflow in bzdecompress caused heap corruption
Fix bug #72836 - integer overflow in base64_decode caused heap corruption
Fix for bug #72807 - do not produce strings with negative length
Fix for bug #72790 and bug #72799
Fix bug #72730 - imagegammacorrect allows arbitrary write access
Fix bug#72697 - select_colors write out-of-bounds
Fixed bug #72627: Memory Leakage In exif_process_IFD_in_TIFF
Fix bug #72750: wddx_deserialize null dereference
Fix bug #72771: ftps:// opendir wrapper is vulnerable to protocol downgrade attack
Improve fix for #72663
Fix bug #70436: Use After Free Vulnerability in unserialize()
Fix bug #72749: wddx_deserialize allows illegal memory access
...

Conflicts:
Zend/zend_API.h
ext/bz2/bz2.c
ext/curl/interface.c
ext/ereg/ereg.c
ext/exif/exif.c
ext/gd/gd.c
ext/gd/tests/imagetruecolortopalette_error3.phpt
ext/gd/tests/imagetruecolortopalette_error4.phpt
ext/session/session.c
ext/snmp/snmp.c
ext/standard/base64.c
ext/standard/ftp_fopen_wrapper.c
ext/standard/quot_print.c
ext/standard/url.c
ext/standard/uuencode.c
ext/standard/var.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
ext/wddx/tests/bug72790.phpt
ext/wddx/tests/bug72799.phpt
ext/wddx/wddx.c
sapi/cli/generate_mime_type_map.php

show more ...

Merge branch 'PHP-7.0' into PHP-7.0.10

* PHP-7.0: (34 commits)
Fix URL rewriter partially
Support "git worktree"
Add NEWS
Fix ASSERT logic
Bugfix 72791: fix mem

Merge branch 'PHP-7.0' into PHP-7.0.10

* PHP-7.0: (34 commits)
Fix URL rewriter partially
Support "git worktree"
Add NEWS
Fix ASSERT logic
Bugfix 72791: fix memory leak in PDO persistent connections
Don't copy mime types in CLI server
Remove obsolete Id tags
Bump version in OCI8 test
Fixed bug #72788 (Invalid memory access when using persistent PDO connection)
Remove typo'd commit
Fix bug 72788: Invalid memory access when database_object_handle is undefined. Also fix memory leak in dbh_free when using persistent PDO connections.
Replace dead branch with ZEND_ASSERT()
Add test for bug #69107: finfo no longer detects PHP files
Fix bug #55451
Fix stream_socket_enable_crypto() test
Remove old $Id$ tags
Sync with 7.1 branch changes from Nikita & Dimitri to keep OCI8 code identical
Fix bug #72524 (Binding null values triggers ORA-24816 error)
Fix the fix (Nikita), thanks!
Check the return value of dbconvert() in mssql_guid_string(), as it may return -1 in case the conversion failed. In that case false is returned.
...

Conflicts:
ext/standard/ftp_fopen_wrapper.c

show more ...

Fixed bug #72627: Memory Leakage In exif_process_IFD_in_TIFF

Fixed bug #72627: Memory Leakage In exif_process_IFD_in_TIFF

(cherry picked from commit 620b01337cc39f856ca68c34c35e154f5f0682fc)

Conflicts:
ext/exif/exif.c

Fixed bug #71534 (Type confusion in exif_read_data() leading to heap overflow in debug mode)

Unlike the original patch, this does not return an unknown format in case an unsigned compatible

Fixed bug #71534 (Type confusion in exif_read_data() leading to heap overflow in debug mode)

Unlike the original patch, this does not return an unknown format in case an unsigned compatible type cannot be found (cases for SINGLE and DOUBLE removed), as these seems rare cases according to the inline comments.

Note, the test does not test if PHP is in debug mode, although the report originally states it only occurs there only.

The fix is based on a patch by hlt99 at blinkenshell dot org

show more ...

Added some extended info about ext/exif to phpinfo()

Remove void comment

Added support for Sigma/Foveon EXIF tags

Note, the tag_info_array is re-used for both SIGMA and FOVEON, as their IFD headers can differ

Added support for Minolta EXIF tags

Added support for PENTAX EXIF tags

Remove this redundant entry for Canon

pefree() these (with persistent=0), as internally in zend_multibyte.c they do the same, and at the same time also cast them to void pointers to silence the compiler warnings.

Fix line endings, getting a little annoyed with VS' warning about mismatch

Fixed bug #68547 (Exif Header component value check error) (Patch by sjh21a at gmail dot com)

This patch changes processing a little and causes some crafted tags to not be parsed and generat

Fixed bug #68547 (Exif Header component value check error) (Patch by sjh21a at gmail dot com)

This patch changes processing a little and causes some crafted tags to not be parsed and generate a warning.

This is a slight BC break from earlier versions, since it will no longer return the tags of that it was mismatching (see bug68799.phpt), namely the "WINXP" section and the "Author" tag is no longer returned due to this. Although this BC break is merely only for crafted tags, this can also have some real life effects on pictures re-saved from editors that can cause bad exif data writes, so lets keep it here.

show more ...

Added support for Sony pictures in EXIF as per requested in bug #72735

Sony is a little more interesting, as it is have a large range of tags it support in different models. For now I have a

Added support for Sony pictures in EXIF as per requested in bug #72735

Sony is a little more interesting, as it is have a large range of tags it support in different models. For now I have added all the tags found within the Exif.Sony1 namespace.

show more ...

Use 'p' to validate a path in exif_imagetype() (like the other exif function already does)

improve the check, avoid strlen on NULL

Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).

Before this patch, exif_process_IFD_in_MAKERNOTE() would return false, then causing the rest of the E

Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).

Before this patch, exif_process_IFD_in_MAKERNOTE() would return false, then causing the rest of the EXIF parsing to be interrupted. This is a regression from earlier which was most likely a part of a security fix for MAKERNOTE.

The new behavior is to instead of stopping to parse, to continue so we can still fetch data like thumbnail and GPS, thrus allowing yet unsupported formats to parse. If EXIF's debugging mode is enabled, a notice will display in case we do not match against a valid MAKERNOTE signature.

This should temporarily fix bug #72682 (exif_read_data() fails to read all data for some images) until I get around to debug it further.

show more ...

Merge branch 'PHP-7.1'

* PHP-7.1:
improve the check, avoid strlen on NULL

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
improve the check, avoid strlen on NULL

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
improve the check, avoid strlen on NULL

improve the check, avoid strlen on NULL

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update NEWS
update NEWS
Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
update NEWS
Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).