php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-17 13:01:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
105,212 Commits 547 Branches 1,483 Tags
2c602be7c85bf41c0aa7cd2b250b39bdac03a960
Commit Graph

105212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
2c602be7c8 Merge branch 'PHP-7.1' into PHP-7.2 2018-04-27 17:02:01 +02:00
Nikita Popov
279ba58edb Fixed bug #76275 
* Adjust IS_SERIALIZED() check to account for potential empty
  allocations at the end of the memory region.
* Deallocate empty allocation if all try/catch elements have been
  removed in the block pass (similar to what we do if all live
  ranges have been eliminated).
 2018-04-27 17:01:35 +02:00
Thomas Punt
972c4869a7 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Allocate default ini values into persistent memory
 2018-04-26 21:09:08 +01:00
Thomas Punt
2513da4b4c Allocate default ini values into persistent memory 2018-04-26 21:08:19 +01:00
Thomas Punt
b3fff5fc41 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix memory leak when phpdbg fails to start up
 2018-04-26 16:42:21 +01:00
Thomas Punt
435e812c09 Fix memory leak when phpdbg fails to start up 2018-04-26 16:39:52 +01:00
Nikita Popov
7c852a7961 Merge branch 'PHP-7.1' into PHP-7.2 2018-04-26 16:17:13 +02:00
shiguangqi2008@gmail.com
98ef183ed0 Fix memory leak in zend_disable_class() 2018-04-26 16:16:37 +02:00
Scott Arciszewski
8677edb2dd Update NEWS 
Add whitespace in NEWS file
 2018-04-25 07:39:31 +02:00
Ferenc Kovacs
029a60b2c7 Merge branch 'PHP-7.1' into PHP-7.2 2018-04-25 00:16:12 +02:00
Ferenc Kovacs
127273327b Merge branch 'PHP-7.0' into PHP-7.1 2018-04-25 00:14:33 +02:00
Ferenc Kovacs
5ac5f313bd Merge branch 'PHP-5.6' into PHP-7.0 2018-04-25 00:13:11 +02:00
Ferenc Kovacs
fe3d53f443 5.6.37 will be next 2018-04-24 23:23:14 +02:00
Remi Collet
42344cdc53 update NEWS for 7.2.5 2018-04-24 17:28:05 +02:00
Anatol Belski
d8f2e1a511 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  7.0.31 next
 2018-04-24 11:37:57 +02:00
Anatol Belski
4b42056042 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  7.0.31 next
 2018-04-24 11:37:10 +02:00
Anatol Belski
090fef553d 7.0.31 next 2018-04-24 11:36:12 +02:00
Anatol Belski
6e5287bb95 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] Update NEWS
 2018-04-24 11:24:10 +02:00
Anatol Belski
befdc10c32 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  [ci skip] Update NEWS
 2018-04-24 11:21:44 +02:00
Anatol Belski
31c3646757 [ci skip] Update NEWS 2018-04-24 11:21:03 +02:00
Anatol Belski
1df43a086f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix test portability
 2018-04-24 10:49:15 +02:00
Anatol Belski
919ead1157 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix test portability
 2018-04-24 10:48:49 +02:00
Anatol Belski
3070883bcf Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix test portability
 2018-04-24 10:48:22 +02:00
Anatol Belski
4371af3e19 Fix test portability 2018-04-24 10:47:32 +02:00
Stanislav Malyshev
4c06d929c0 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix tsrm_ls
  Fix #76129 - remove more potential unfiltered outputs for phar
  Fix test
  Fix bug #76248 - Malicious LDAP-Server Response causes Crash
  Fix bug #76249 - fail on invalid sequences
  Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
  Fix bug #75981: prevent reading beyond buffer start
 2018-04-23 22:03:33 -07:00
Stanislav Malyshev
95ee9efa57 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix tsrm_ls
  Fix #76129 - remove more potential unfiltered outputs for phar
  Fix test
  Fix bug #76248 - Malicious LDAP-Server Response causes Crash
  Fix bug #76249 - fail on invalid sequences
  Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
  Fix bug #75981: prevent reading beyond buffer start
 2018-04-23 22:00:24 -07:00
Stanislav Malyshev
5a18d7a0df Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix tsrm_ls
  Fix #76129 - remove more potential unfiltered outputs for phar
  Fix test
  Fix bug #76248 - Malicious LDAP-Server Response causes Crash
  Fix bug #76249 - fail on invalid sequences
  Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
  Fix bug #75981: prevent reading beyond buffer start
 2018-04-23 21:59:57 -07:00
Stanislav Malyshev
ee76a5ae5a Fix tsrm_ls 2018-04-23 16:48:27 -07:00
Stanislav Malyshev
58b0003975 Merge remote-tracking branch 'security/bug76249' into PHP-5.6 
* security/bug76249:
  Fix test
  Fix bug #76249 - fail on invalid sequences
 2018-04-23 13:44:19 -07:00
Stanislav Malyshev
a4c55eefd0 Merge remote-tracking branch 'security/bug76248' into PHP-5.6 
* security/bug76248:
  Fix bug #76248 - Malicious LDAP-Server Response causes Crash
 2018-04-23 13:44:12 -07:00
Stanislav Malyshev
6e64aba47f Fix #76129 - remove more potential unfiltered outputs for phar 2018-04-23 13:43:43 -07:00
Stanislav Malyshev
e2dcf3cc54 Merge remote-tracking branch 'security/PHP-5.6' into PHP-5.6 
* security/PHP-5.6:
  Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
  Fix bug #75981: prevent reading beyond buffer start
 2018-04-23 13:42:51 -07:00
Stanislav Malyshev
8dca5ae5ec Fix test 2018-04-22 22:19:51 -07:00
Stanislav Malyshev
49782c5499 Fix bug #76248 - Malicious LDAP-Server Response causes Crash 2018-04-22 22:01:35 -07:00
Stanislav Malyshev
06d309fd7a Fix bug #76249 - fail on invalid sequences 2018-04-22 21:26:39 -07:00
Stanislav Malyshev
83e7618f05 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Add a bit of defensive conding for bug #76155
 2018-04-22 20:28:35 -07:00
Stanislav Malyshev
ff83c00715 Add a bit of defensive conding for bug #76155 
Even though it should not be ever negative, since strlen() is size_t
better to be safe than sorry.
 2018-04-22 20:27:42 -07:00
Christoph M. Becker
b4e4788c44 Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value 
The MakerNote is not necessarily null-terminated, so we must not use
`strlen()` to avoid OOB reads.  Instead `php_strnlen()` is the proper
way to handle this.
 2018-04-22 20:15:02 -07:00
Jakub Zelenka
98e43a33c8 Merge branch 'PHP-7.1' into PHP-7.2 2018-04-15 20:42:28 +01:00
Jakub Zelenka
2ef8809ef3 Make openssl_error_string test work in OpenSSL 1.1.1 
It was the only failing test
 2018-04-15 20:41:23 +01:00
Nikita Popov
ac732d75bd Merge branch 'PHP-7.1' into PHP-7.2 2018-04-14 13:06:00 +02:00
Aron Rotteveel
9090a21de0 reset imap_errorstack after outputting it 
This happens in `imap_errors` as well, but seems to be omitted in the `shutdown` routine.
 2018-04-14 13:04:40 +02:00
Jakub Zelenka
b8aec1e725 Merge branch 'PHP-7.1' into PHP-7.2 2018-04-13 20:17:52 +01:00
Jakub Zelenka
4e407b8777 [ci skip] Update NEWS with fpm acl fix 2018-04-13 20:17:24 +01:00
Jakub Zelenka
4302c0b542 Merge branch 'PHP-7.1' into PHP-7.2 2018-04-13 20:12:03 +01:00
Michał Górny
4ea7f3467d Support using acl_* functions on *BSD 
The *BSD systems have ACL routines built-in in libc rather than
in separate libacl. Update the configure check to detect that and enable
ACL support without adding 'acl' library.
 2018-04-13 19:48:13 +01:00
Christoph M. Becker
3770c2e463 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix arginfo for array_replace(_recursive) and array_merge(_recursive)
 2018-04-13 15:28:47 +02:00
Gabriel Caruso
bb79e5764b Fix arginfo for array_replace(_recursive) and array_merge(_recursive) 2018-04-13 15:27:16 +02:00
Christoph M. Becker
281a1754b9 Fix #76164: exif_read_data zend_mm_heap corrupted 
We must not release parsed parameters ourselves, since this is already
done by the engine.
 2018-04-12 23:00:37 +02:00
Anatol Belski
9f4905fb0d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix memory leak
 2018-04-12 18:25:58 +02:00