]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 1 Dec 2014 13:43:22 +0000 (14:43 +0100)
committerAnatol Belski <ab@php.net>
Mon, 1 Dec 2014 13:43:22 +0000 (14:43 +0100)
* PHP-5.5:
  fix possible null pointer math

1  2 
sapi/cgi/cgi_main.c

Simple merge