]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorChristoph M. Becker <cmbecker69@gmx.de>
Wed, 11 Mar 2020 10:32:46 +0000 (11:32 +0100)
committerChristoph M. Becker <cmbecker69@gmx.de>
Wed, 11 Mar 2020 10:32:46 +0000 (11:32 +0100)
* PHP-7.4:
  Fix #78210: Invalid pointer address

1  2 
ext/standard/streamsfuncs.c
main/network.c
main/streams/xp_socket.c

Simple merge
diff --cc main/network.c
Simple merge
Simple merge