Skip to content

Commit 46dc21c

Browse files
GirgiasGirgias
committed
Improve count() in regards to argument checks
Add ZPP checks for the first argument to ensure it is an array or a Countable object. Due to earlier discussion NULL is special cased and deprecated. Also throw a ValueError on invalid mode values.
1 parent 6422d00 commit 46dc21c

23 files changed

+834
-844
lines changed

‎Zend/tests/generators/errors/count_error.phpt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ try {
1111
count($gen);
1212
} catch (Exception $e) {
1313
echo $e;
14-
}
14+
} catch (\TypeError $e) {
15+
echo $e->getMessage() . "\n";
16+
}
1517

1618
?>
17-
--EXPECTF--
18-
Warning: count(): Parameter must be an array or an object that implements Countable in %s on line %d
19+
--EXPECT--
20+
Parameter must be an array or an object that implements Countable

‎Zend/zend_vm_def.h

Lines changed: 25 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -8416,53 +8416,38 @@ ZEND_VM_COLD_CONST_HANDLER(190, ZEND_COUNT, CONST|TMPVAR|CV, UNUSED)
84168416
{
84178417
USE_OPLINE
84188418
zval *op1;
8419-
zend_long count;
8419+
zend_long count = 1;
84208420

84218421
SAVE_OPLINE();
84228422
op1 = GET_OP1_ZVAL_PTR_UNDEF(BP_VAR_R);
8423-
while (1) {
8424-
if (Z_TYPE_P(op1) == IS_ARRAY) {
8425-
count = zend_array_count(Z_ARRVAL_P(op1));
8426-
break;
8427-
} else if (Z_TYPE_P(op1) == IS_OBJECT) {
8428-
zend_object *zobj = Z_OBJ_P(op1);
8429-
8430-
/* first, we check if the handler is defined */
8431-
if (zobj->handlers->count_elements) {
8432-
if (SUCCESS == zobj->handlers->count_elements(zobj, &count)) {
8433-
break;
8434-
}
8435-
if (UNEXPECTED(EG(exception))) {
8436-
count = 0;
8437-
break;
8438-
}
8439-
}
8440-
8441-
/* if not and the object implements Countable we call its count() method */
8442-
if (zend_class_implements_interface(zobj->ce, zend_ce_countable)) {
8443-
zval retval;
84448423

8445-
zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval);
8446-
count = zval_get_long(&retval);
8447-
zval_ptr_dtor(&retval);
8448-
break;
8449-
}
8424+
if ((OP1_TYPE & (IS_VAR|IS_CV)) != 0 && Z_TYPE_P(op1) == IS_REFERENCE) {
8425+
op1 = Z_REFVAL_P(op1);
8426+
}
84508427

8451-
/* If There's no handler and it doesn't implement Countable then add a warning */
8452-
count = 1;
8453-
} else if ((OP1_TYPE & (IS_VAR|IS_CV)) != 0 && Z_TYPE_P(op1) == IS_REFERENCE) {
8454-
op1 = Z_REFVAL_P(op1);
8455-
continue;
8456-
} else if (Z_TYPE_P(op1) <= IS_NULL) {
8457-
if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
8458-
ZVAL_UNDEFINED_OP1();
8459-
}
8460-
count = 0;
8428+
if (Z_TYPE_P(op1) <= IS_NULL) {
8429+
/* Intentionally not converted to an exception */
8430+
zend_error(E_DEPRECATED, "%s(): Passing null is deprecated", opline->extended_value ? "sizeof" : "count");
8431+
if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
8432+
ZVAL_UNDEFINED_OP1();
8433+
}
8434+
count = 0;
8435+
} else if (Z_TYPE_P(op1) == IS_ARRAY) {
8436+
count = zend_array_count(Z_ARRVAL_P(op1));
8437+
} else if (Z_TYPE_P(op1) == IS_OBJECT) {
8438+
zend_object *zobj = Z_OBJ_P(op1);
8439+
/* if the object implements Countable we call its count() method */
8440+
if (zend_class_implements_interface(zobj->ce, zend_ce_countable)) {
8441+
zval retval;
8442+
8443+
zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval);
8444+
count = zval_get_long(&retval);
8445+
zval_ptr_dtor(&retval);
84618446
} else {
8462-
count = 1;
8447+
zend_type_error("Parameter must be an array or an object that implements Countable");
84638448
}
8464-
zend_error(E_WARNING, "%s(): Parameter must be an array or an object that implements Countable", opline->extended_value ? "sizeof" : "count");
8465-
break;
8449+
} else {
8450+
zend_type_error("Parameter must be an array or an object that implements Countable");
84668451
}
84678452

84688453
ZVAL_LONG(EX_VAR(opline->result.var), count);

‎Zend/zend_vm_execute.h

Lines changed: 72 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -9250,53 +9250,38 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_CONST_
92509250
{
92519251
USE_OPLINE
92529252
zval *op1;
9253-
zend_long count;
9253+
zend_long count = 1;
92549254

92559255
SAVE_OPLINE();
92569256
op1 = RT_CONSTANT(opline, opline->op1);
9257-
while (1) {
9258-
if (Z_TYPE_P(op1) == IS_ARRAY) {
9259-
count = zend_array_count(Z_ARRVAL_P(op1));
9260-
break;
9261-
} else if (Z_TYPE_P(op1) == IS_OBJECT) {
9262-
zend_object *zobj = Z_OBJ_P(op1);
92639257

9264-
/* first, we check if the handler is defined */
9265-
if (zobj->handlers->count_elements) {
9266-
if (SUCCESS == zobj->handlers->count_elements(zobj, &count)) {
9267-
break;
9268-
}
9269-
if (UNEXPECTED(EG(exception))) {
9270-
count = 0;
9271-
break;
9272-
}
9273-
}
9274-
9275-
/* if not and the object implements Countable we call its count() method */
9276-
if (zend_class_implements_interface(zobj->ce, zend_ce_countable)) {
9277-
zval retval;
9258+
if ((IS_CONST & (IS_VAR|IS_CV)) != 0 && Z_TYPE_P(op1) == IS_REFERENCE) {
9259+
op1 = Z_REFVAL_P(op1);
9260+
}
92789261

9279-
zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval);
9280-
count = zval_get_long(&retval);
9281-
zval_ptr_dtor(&retval);
9282-
break;
9283-
}
9262+
if (Z_TYPE_P(op1) <= IS_NULL) {
9263+
/* Intentionally not converted to an exception */
9264+
zend_error(E_DEPRECATED, "%s(): Passing null is deprecated", opline->extended_value ? "sizeof" : "count");
9265+
if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
9266+
ZVAL_UNDEFINED_OP1();
9267+
}
9268+
count = 0;
9269+
} else if (Z_TYPE_P(op1) == IS_ARRAY) {
9270+
count = zend_array_count(Z_ARRVAL_P(op1));
9271+
} else if (Z_TYPE_P(op1) == IS_OBJECT) {
9272+
zend_object *zobj = Z_OBJ_P(op1);
9273+
/* if the object implements Countable we call its count() method */
9274+
if (zend_class_implements_interface(zobj->ce, zend_ce_countable)) {
9275+
zval retval;
92849276

9285-
/* If There's no handler and it doesn't implement Countable then add a warning */
9286-
count = 1;
9287-
} else if ((IS_CONST & (IS_VAR|IS_CV)) != 0 && Z_TYPE_P(op1) == IS_REFERENCE) {
9288-
op1 = Z_REFVAL_P(op1);
9289-
continue;
9290-
} else if (Z_TYPE_P(op1) <= IS_NULL) {
9291-
if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
9292-
ZVAL_UNDEFINED_OP1();
9293-
}
9294-
count = 0;
9277+
zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval);
9278+
count = zval_get_long(&retval);
9279+
zval_ptr_dtor(&retval);
92959280
} else {
9296-
count = 1;
9281+
zend_type_error("Parameter must be an array or an object that implements Countable");
92979282
}
9298-
zend_error(E_WARNING, "%s(): Parameter must be an array or an object that implements Countable", opline->extended_value ? "sizeof" : "count");
9299-
break;
9283+
} else {
9284+
zend_type_error("Parameter must be an array or an object that implements Countable");
93009285
}
93019286

93029287
ZVAL_LONG(EX_VAR(opline->result.var), count);
@@ -16266,53 +16251,38 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_TMPVAR_UNUSED_HANDL
1626616251
{
1626716252
USE_OPLINE
1626816253
zval *op1;
16269-
zend_long count;
16254+
zend_long count = 1;
1627016255

1627116256
SAVE_OPLINE();
1627216257
op1 = _get_zval_ptr_var(opline->op1.var EXECUTE_DATA_CC);
16273-
while (1) {
16274-
if (Z_TYPE_P(op1) == IS_ARRAY) {
16275-
count = zend_array_count(Z_ARRVAL_P(op1));
16276-
break;
16277-
} else if (Z_TYPE_P(op1) == IS_OBJECT) {
16278-
zend_object *zobj = Z_OBJ_P(op1);
16279-
16280-
/* first, we check if the handler is defined */
16281-
if (zobj->handlers->count_elements) {
16282-
if (SUCCESS == zobj->handlers->count_elements(zobj, &count)) {
16283-
break;
16284-
}
16285-
if (UNEXPECTED(EG(exception))) {
16286-
count = 0;
16287-
break;
16288-
}
16289-
}
1629016258

16291-
/* if not and the object implements Countable we call its count() method */
16292-
if (zend_class_implements_interface(zobj->ce, zend_ce_countable)) {
16293-
zval retval;
16259+
if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV)) != 0 && Z_TYPE_P(op1) == IS_REFERENCE) {
16260+
op1 = Z_REFVAL_P(op1);
16261+
}
1629416262

16295-
zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval);
16296-
count = zval_get_long(&retval);
16297-
zval_ptr_dtor(&retval);
16298-
break;
16299-
}
16263+
if (Z_TYPE_P(op1) <= IS_NULL) {
16264+
/* Intentionally not converted to an exception */
16265+
zend_error(E_DEPRECATED, "%s(): Passing null is deprecated", opline->extended_value ? "sizeof" : "count");
16266+
if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
16267+
ZVAL_UNDEFINED_OP1();
16268+
}
16269+
count = 0;
16270+
} else if (Z_TYPE_P(op1) == IS_ARRAY) {
16271+
count = zend_array_count(Z_ARRVAL_P(op1));
16272+
} else if (Z_TYPE_P(op1) == IS_OBJECT) {
16273+
zend_object *zobj = Z_OBJ_P(op1);
16274+
/* if the object implements Countable we call its count() method */
16275+
if (zend_class_implements_interface(zobj->ce, zend_ce_countable)) {
16276+
zval retval;
1630016277

16301-
/* If There's no handler and it doesn't implement Countable then add a warning */
16302-
count = 1;
16303-
} else if (((IS_TMP_VAR|IS_VAR) & (IS_VAR|IS_CV)) != 0 && Z_TYPE_P(op1) == IS_REFERENCE) {
16304-
op1 = Z_REFVAL_P(op1);
16305-
continue;
16306-
} else if (Z_TYPE_P(op1) <= IS_NULL) {
16307-
if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
16308-
ZVAL_UNDEFINED_OP1();
16309-
}
16310-
count = 0;
16278+
zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval);
16279+
count = zval_get_long(&retval);
16280+
zval_ptr_dtor(&retval);
1631116281
} else {
16312-
count = 1;
16282+
zend_type_error("Parameter must be an array or an object that implements Countable");
1631316283
}
16314-
zend_error(E_WARNING, "%s(): Parameter must be an array or an object that implements Countable", opline->extended_value ? "sizeof" : "count");
16315-
break;
16284+
} else {
16285+
zend_type_error("Parameter must be an array or an object that implements Countable");
1631616286
}
1631716287

1631816288
ZVAL_LONG(EX_VAR(opline->result.var), count);
@@ -45033,53 +45003,38 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_COUNT_SPEC_CV_UNUSED_HANDLER(Z
4503345003
{
4503445004
USE_OPLINE
4503545005
zval *op1;
45036-
zend_long count;
45006+
zend_long count = 1;
4503745007

4503845008
SAVE_OPLINE();
4503945009
op1 = EX_VAR(opline->op1.var);
45040-
while (1) {
45041-
if (Z_TYPE_P(op1) == IS_ARRAY) {
45042-
count = zend_array_count(Z_ARRVAL_P(op1));
45043-
break;
45044-
} else if (Z_TYPE_P(op1) == IS_OBJECT) {
45045-
zend_object *zobj = Z_OBJ_P(op1);
45046-
45047-
/* first, we check if the handler is defined */
45048-
if (zobj->handlers->count_elements) {
45049-
if (SUCCESS == zobj->handlers->count_elements(zobj, &count)) {
45050-
break;
45051-
}
45052-
if (UNEXPECTED(EG(exception))) {
45053-
count = 0;
45054-
break;
45055-
}
45056-
}
4505745010

45058-
/* if not and the object implements Countable we call its count() method */
45059-
if (zend_class_implements_interface(zobj->ce, zend_ce_countable)) {
45060-
zval retval;
45011+
if ((IS_CV & (IS_VAR|IS_CV)) != 0 && Z_TYPE_P(op1) == IS_REFERENCE) {
45012+
op1 = Z_REFVAL_P(op1);
45013+
}
4506145014

45062-
zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval);
45063-
count = zval_get_long(&retval);
45064-
zval_ptr_dtor(&retval);
45065-
break;
45066-
}
45015+
if (Z_TYPE_P(op1) <= IS_NULL) {
45016+
/* Intentionally not converted to an exception */
45017+
zend_error(E_DEPRECATED, "%s(): Passing null is deprecated", opline->extended_value ? "sizeof" : "count");
45018+
if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
45019+
ZVAL_UNDEFINED_OP1();
45020+
}
45021+
count = 0;
45022+
} else if (Z_TYPE_P(op1) == IS_ARRAY) {
45023+
count = zend_array_count(Z_ARRVAL_P(op1));
45024+
} else if (Z_TYPE_P(op1) == IS_OBJECT) {
45025+
zend_object *zobj = Z_OBJ_P(op1);
45026+
/* if the object implements Countable we call its count() method */
45027+
if (zend_class_implements_interface(zobj->ce, zend_ce_countable)) {
45028+
zval retval;
4506745029

45068-
/* If There's no handler and it doesn't implement Countable then add a warning */
45069-
count = 1;
45070-
} else if ((IS_CV & (IS_VAR|IS_CV)) != 0 && Z_TYPE_P(op1) == IS_REFERENCE) {
45071-
op1 = Z_REFVAL_P(op1);
45072-
continue;
45073-
} else if (Z_TYPE_P(op1) <= IS_NULL) {
45074-
if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(op1) == IS_UNDEF)) {
45075-
ZVAL_UNDEFINED_OP1();
45076-
}
45077-
count = 0;
45030+
zend_call_method_with_0_params(zobj, NULL, NULL, "count", &retval);
45031+
count = zval_get_long(&retval);
45032+
zval_ptr_dtor(&retval);
4507845033
} else {
45079-
count = 1;
45034+
zend_type_error("Parameter must be an array or an object that implements Countable");
4508045035
}
45081-
zend_error(E_WARNING, "%s(): Parameter must be an array or an object that implements Countable", opline->extended_value ? "sizeof" : "count");
45082-
break;
45036+
} else {
45037+
zend_type_error("Parameter must be an array or an object that implements Countable");
4508345038
}
4508445039

4508545040
ZVAL_LONG(EX_VAR(opline->result.var), count);

0 commit comments

Comments
 (0)