]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 20 Jan 2015 19:46:39 +0000 (11:46 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 20 Jan 2015 19:46:39 +0000 (11:46 -0800)
* PHP-5.4:
  add protection against nulls

1  2 
main/spprintf.c

diff --cc main/spprintf.c
Simple merge