Commit Graph

115527 Commits

Author SHA1 Message Date
Christoph M. Becker
7f36328bf0 Add ext/tidy stubs 2019-09-22 16:18:33 +02:00
Christoph M. Becker
6072fe4342 Properly use zend_parse_method_parameters()
`zend_parse_method_parameters()` is meant for dual (procedural and OO)
APIs; there is no need to attempt to get "this" first, and to dispatch
to `zend_parse_parameters()` and `zend_parse_method_parameters()`,
respectively.
2019-09-22 16:18:33 +02:00
Christoph M. Becker
071ccee7f7 Add ext/dba stubs 2019-09-22 13:58:30 +02:00
Nikita Popov
c6315f86c9 Merge branch 'PHP-7.4' 2019-09-22 12:13:22 +02:00
Nikita Popov
5e48bb7e1f Merge branch 'PHP-7.3' into PHP-7.4 2019-09-22 12:10:49 +02:00
Nikita Popov
9cd365e571 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-22 12:10:42 +02:00
Nikita Popov
f989a4cd44 Fix leak of temporary buffer during exif tag reading 2019-09-22 12:10:17 +02:00
Nikita Popov
0a6291b81a Merge branch 'PHP-7.4' 2019-09-22 10:27:21 +02:00
Nikita Popov
0508a70640 Merge branch 'PHP-7.3' into PHP-7.4 2019-09-22 10:27:07 +02:00
Nikita Popov
623d897998 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-22 10:26:57 +02:00
Christoph M. Becker
f2f3134118 Employ zend_parse_method_parameters() 2019-09-22 10:16:06 +02:00
Nikita Popov
0701835c01 Fix multiple leaks in exif_read_data()
This fixes two leaks related to duplicate tags, as well as a leak
of zero-length FMT_(S)BYTE with non-null value. This can show up
for MAKERNOTE values where the original length is non-zero, but
the first character is a null byte.
2019-09-21 20:40:03 +02:00
Christoph M. Becker
0f56110615 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix length of key passed to zend_hash_str_find_ptr
2019-09-21 18:13:31 +02:00
Christoph M. Becker
f5b9cc4bcf Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix length of key passed to zend_hash_str_find_ptr
2019-09-21 18:13:06 +02:00
Christoph M. Becker
33e556fab4 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix length of key passed to zend_hash_str_find_ptr
2019-09-21 18:12:27 +02:00
Jinesh Patel
0d6c2448a7 Fix length of key passed to zend_hash_str_find_ptr 2019-09-21 18:11:21 +02:00
Christoph M. Becker
48892e6d24 Remove unused parameter
Cf. <https://bugs.php.net/78579>.
2019-09-21 16:30:17 +02:00
Christoph M. Becker
8293667f60 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix #78579: mb_decode_numericentity: args number inconsistency
2019-09-21 16:18:20 +02:00
Christoph M. Becker
6dea11acd8 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix #78579: mb_decode_numericentity: args number inconsistency
2019-09-21 16:17:45 +02:00
Christoph M. Becker
698088ca7c Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix #78579: mb_decode_numericentity: args number inconsistency
2019-09-21 16:16:52 +02:00
Christoph M. Becker
398b308316 Fix #78579: mb_decode_numericentity: args number inconsistency
mb_decode_numericentity() accepts a fourth optional parameter, which is
unused, however.  Since this parameter doesn't do any harm, and to avoid
the small BC break, we're keeping this parameter for PHP 7, but adjust
the arginfo.

For PHP 8, we will remove this parameter.
2019-09-21 16:15:23 +02:00
Bishop Bettini
1b086f506b [ci skip] Add phar + imap maintainer email
Looks like commit c09b13cb (Add Bishop Bettini as maintainer for
phar & imap, 2019-03-16) missed adding my email address.
2019-09-20 12:59:50 -04:00
Remi Collet
7eaf2389d8 Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed bug #78574 (broken shared build)
2019-09-20 13:30:28 +02:00
Remi Collet
dc40332bb2 Fixed bug #78574 (broken shared build) 2019-09-20 13:30:13 +02:00
Christoph M. Becker
e0a213d98f Make MSVC happy again
MSVC complains about unsupported preprocessor syntax, so we employ the
same workaround as in zend_cpuinfo.h.
2019-09-20 12:51:03 +02:00
Craig Duncan
8326ef5519 Convert soap functions arginfo to php stubs
We alos make the last parameter of `SoapClient::__setCookie()` and
`SoapFault::__construct()` properly nullable.
2019-09-20 11:21:13 +02:00
Craig Duncan
48e696319c Convert pcntl functions arginfo to php stubs 2019-09-20 11:15:22 +02:00
Dmitry Stogov
3d59cec506 Merge branch 'PHP-7.4'
* PHP-7.4:
  Don't buid static libaraies when only DSO required
2019-09-19 23:46:45 +03:00
Dmitry Stogov
f633c34757 Don't buid static libaraies when only DSO required 2019-09-19 23:44:53 +03:00
Nikita Popov
6a21804b83 Merge branch 'PHP-7.4' 2019-09-19 21:14:54 +02:00
Nikita Popov
f0f84adf2b Merge branch 'PHP-7.3' into PHP-7.4 2019-09-19 21:14:46 +02:00
Nikita Popov
e76dea4283 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-19 21:14:40 +02:00
Nikita Popov
0fa13028cb Fix out-of-bounds read in exif tag reading
This issue was recently introduced in c739023a50,
when the restriction that components>0 has been relaxed. We now need
to make sure that any tags that expect at least one component check
that this is the case.
2019-09-19 21:11:57 +02:00
Nikita Popov
eedc4f1295 Merge branch 'PHP-7.4' 2019-09-19 21:02:20 +02:00
Nikita Popov
3fd68fd827 Clean up JSON parser
Don't use <value> type for JSON tokens that don't have a value
and remove the errlex productions -- we're going to get an
unexpected token error anyway, there's no need to handle these
explicitly.

This also removes the awkward workarounds for the unused value
warnings.
2019-09-19 21:00:22 +02:00
Dmitry Stogov
ddfb3d6056 Fixed 32-bit JIT 2019-09-19 21:53:36 +03:00
Stephen Reay
c34de80df8 Convert IMAP function aliases
These are not really aliases, convert them to normal functions.

Closes GH-4725.
2019-09-19 17:24:49 +02:00
Nikita Popov
edfcf2d81f Merge branch 'PHP-7.4' 2019-09-19 17:22:34 +02:00
Nikita Popov
5bee9c9062 Merge branch 'PHP-7.3' into PHP-7.4 2019-09-19 17:22:28 +02:00
Nikita Popov
85e7668129 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-19 17:21:45 +02:00
Nikita Popov
003c13d7bc Fix iterable return type optimization 2019-09-19 17:21:00 +02:00
Nikita Popov
975ef6ea9c Merge branch 'PHP-7.4' 2019-09-19 14:20:38 +02:00
Nikita Popov
8a599c7b74 Merge branch 'PHP-7.3' into PHP-7.4 2019-09-19 14:20:13 +02:00
Nikita Popov
6bf5c8508a Merge branch 'PHP-7.2' into PHP-7.3 2019-09-19 14:20:04 +02:00
Nikita Popov
3e139a4653 Fix exif leak on duplicate copyright tags 2019-09-19 14:19:31 +02:00
Nikita Popov
962a9cd74e Merge branch 'PHP-7.4' 2019-09-19 11:36:29 +02:00
Nikita Popov
22516b7d8a Merge branch 'PHP-7.3' into PHP-7.4 2019-09-19 11:36:19 +02:00
Nikita Popov
f53b8268d6 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-19 11:36:09 +02:00
CJDennis
e3255a4f49 Fix typo
`sizeof("data")-1` and `sizeof("date")-1` are both 4, so no change in behaviour
2019-09-19 11:36:00 +02:00
Nikita Popov
cdd4e591a4 Don't make argument nullable based on AST null initializer
Closes GH-4720.
2019-09-19 11:27:00 +02:00