granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 722783c 946335b)

author	Anatol Belski <ab@php.net>
	Mon, 29 Aug 2016 18:34:44 +0000 (20:34 +0200)
committer	Anatol Belski <ab@php.net>
	Mon, 29 Aug 2016 18:34:44 +0000 (20:34 +0200)
commit	22a825db85070ecb9b7e4e5d6499782500c5eb97
tree	2cd3a2e1c73cfdf8bc8b287ff34fa6a8ab436ce8	tree \| snapshot
parent	722783c2c671353c93acd0718e1481c8969fe561	commit \| diff
parent	946335ba706b7dbfe70a5fc9a1e74ee46af19cfe	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify

ext/standard/crypt.c

Unnamed repository; edit this file 'description' to name the repository.