This commit is contained in:
CismonX 2019-05-30 12:54:12 +08:00
parent 6cf646a6d0
commit 92e15f3e5f
2 changed files with 4 additions and 3 deletions

View File

@ -83,17 +83,18 @@ namespace php_arma
break;
}
ZEND_HASH_FOREACH_VAL(Z_ARR_P(row), zval *elem)
if (idx_col > num_cols - 1) {
if (UNEXPECTED(idx_col > num_cols - 1)) {
break;
}
if (UNEXPECTED(!zval_check_scalar<T>(elem))) {
break;
goto end_loop;
}
native->at(idx_row, idx_col++) = zval_get_scalar<T>(elem);
ZEND_HASH_FOREACH_END();
++idx_row;
idx_col = 0;
ZEND_HASH_FOREACH_END();
end_loop:
RETVAL_OBJ(zobj);
}

View File

@ -1,5 +1,5 @@
--TEST--
Test for initialization of `Mat`
Test for initialization of `Mat`.
--SKIPIF--
<?php
require_once 'includes/loaded.php';