]> granicus.if.org Git - php/commit
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)
commit910d4751e3c9e969a26a590780a4688a47a77850
tree8822facd499594bcc04c002d54e6505713e6264c
parent9e4651f6f181e0d90daab2a97fb57a76fe105a29
parent2186e1583d9d65d0e79d05ec706f1e12b97bb035
Merge branch 'PHP-5.4' into PHP-5.5

* 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.