- MFH: Fix bug #37060 (Type of retval of Countable::count() is not checked)

This commit is contained in:
Johannes Schlüter 2006-04-12 19:30:52 +00:00
parent 5751903b1b
commit 9047558fe3
2 changed files with 3 additions and 0 deletions

2
NEWS
View File

@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Apr 2006, PHP 5.1.3
- Fixed bug #37060 (Type of retval of Countable::count() is not checked).
(Johannes)
- FIxed bug #37059 (oci_bind_by_name() doesn't support RAW and LONG RAW
fields). (Tony)
- Fixed bug #37057 (xmlrpc_decode() may produce arrays with numeric strings,

View File

@ -313,6 +313,7 @@ PHP_FUNCTION(count)
if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) {
zend_call_method_with_0_params(&array, NULL, NULL, "count", &retval);
if (retval) {
convert_to_long(retval);
RETVAL_LONG(Z_LVAL_P(retval));
zval_ptr_dtor(&retval);
}