Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
- Fixed possible NULL ptr dereference
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed possible NULL ptr dereference
Merge branch 'PHP-5.5'

* PHP-5.5:
  - Fixed possible NULL ptr dereference