From c588db1ee7c4e0c28d0792ba3da4b5edea780bab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Tue, 18 Jun 2024 22:34:18 +0200 Subject: [PATCH] Use RETURN_THROWS() for WeakMap methods --- Zend/zend_weakrefs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Zend/zend_weakrefs.c b/Zend/zend_weakrefs.c index 3af7a386ad2..aea46e49341 100644 --- a/Zend/zend_weakrefs.c +++ b/Zend/zend_weakrefs.c @@ -694,12 +694,12 @@ ZEND_METHOD(WeakMap, offsetGet) zval *key; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &key) == FAILURE) { - return; + RETURN_THROWS(); } zval *zv = zend_weakmap_read_dimension(Z_OBJ_P(ZEND_THIS), key, BP_VAR_R, NULL); if (!zv) { - return; + RETURN_THROWS(); } ZVAL_COPY(return_value, zv); @@ -710,7 +710,7 @@ ZEND_METHOD(WeakMap, offsetSet) zval *key, *value; if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &key, &value) == FAILURE) { - return; + RETURN_THROWS(); } zend_weakmap_write_dimension(Z_OBJ_P(ZEND_THIS), key, value); @@ -721,7 +721,7 @@ ZEND_METHOD(WeakMap, offsetExists) zval *key; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &key) == FAILURE) { - return; + RETURN_THROWS(); } RETURN_BOOL(zend_weakmap_has_dimension(Z_OBJ_P(ZEND_THIS), key, /* check_empty */ 0)); @@ -732,7 +732,7 @@ ZEND_METHOD(WeakMap, offsetUnset) zval *key; if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &key) == FAILURE) { - return; + RETURN_THROWS(); } zend_weakmap_unset_dimension(Z_OBJ_P(ZEND_THIS), key); @@ -741,7 +741,7 @@ ZEND_METHOD(WeakMap, offsetUnset) ZEND_METHOD(WeakMap, count) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } zend_long count; @@ -752,7 +752,7 @@ ZEND_METHOD(WeakMap, count) ZEND_METHOD(WeakMap, getIterator) { if (zend_parse_parameters_none() == FAILURE) { - return; + RETURN_THROWS(); } zend_create_internal_iterator_zval(return_value, ZEND_THIS);