Clean up this weird safe_emalloc() call
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Clean up this weird safe_emalloc() call
Merge branch 'PHP-5.5'

* PHP-5.5:
  Clean up this weird safe_emalloc() call