]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRasmus Lerdorf <rasmus@lerdorf.com>
Mon, 21 Oct 2013 05:18:15 +0000 (22:18 -0700)
committerRasmus Lerdorf <rasmus@lerdorf.com>
Mon, 21 Oct 2013 05:18:15 +0000 (22:18 -0700)
* PHP-5.4:
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.


Trivial merge