Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #67433 SIGSEGV when using count() on an object implementing Countable
This commit is contained in:
Matteo Beccati 2014-06-13 13:14:52 +02:00
commit 7d2bcbe20c

View file

@ -342,8 +342,7 @@ PHP_FUNCTION(count)
RETVAL_LONG(Z_LVAL_P(retval));
zval_ptr_dtor(&retval);
}
zval_dtor(mode_zv);
efree(mode_zv);
zval_ptr_dtor(&mode_zv);
return;
}
#endif