]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Sat, 22 Apr 2017 19:58:10 +0000 (21:58 +0200)
committerAnatol Belski <ab@php.net>
Sat, 22 Apr 2017 19:58:10 +0000 (21:58 +0200)
* PHP-7.0:
  #74337 pointer returned by php_stream_fopen_tmpfile not validated in memory.c

1  2 
main/streams/memory.c

Simple merge