Use RETURN_THROWS() in various places

diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c
index 0ae3df56414ee4969cf2f20de1e3b4e23a7dceed..58c7f7b96347cbf0d9bec02d59689f4e769b8207 100644 (file)
--- a/ext/com_dotnet/com_com.c
+++ b/ext/com_dotnet/com_com.c
@@ -62,13 +62,13 @@ PHP_FUNCTION(com_create_instance)
                        ZEND_NUM_ARGS(), "sa|ls",
                        &module_name, &module_name_len, &server_params, &cp,
                        &typelib_name, &typelib_name_len)) {
-               return;
+               RETURN_THROWS();
        }
 
        cp_it = php_win32_cp_get_by_id((DWORD)cp);
        if (!cp_it) {
                php_com_throw_exception(E_INVALIDARG, "Could not create COM object - invalid codepage!");
-               return;
+               RETURN_THROWS();
        }
        obj->code_page = (int)cp;
 
@@ -116,7 +116,7 @@ PHP_FUNCTION(com_create_instance)
 
        if (server_name && !COMG(allow_dcom)) {
                php_com_throw_exception(E_ERROR, "DCOM has been disabled by your administrator [com.allow_dcom=0]");
-               return;
+               RETURN_THROWS();
        }
 
        moniker = php_com_string_to_olestring(module_name, module_name_len, obj->code_page);
@@ -231,7 +231,7 @@ PHP_FUNCTION(com_create_instance)
 
                php_com_throw_exception(res, msg);
                efree(msg);
-               return;
+               RETURN_THROWS();
        }
 
        /* we got the object and it lives ! */

diff --git a/ext/com_dotnet/com_dotnet.c b/ext/com_dotnet/com_dotnet.c
index ad35d91636f8705e8e179801a0e4789971a0f39a..bee7116fc3d1d76cbdf829c6d791337762ee4e78 100644 (file)
--- a/ext/com_dotnet/com_dotnet.c
+++ b/ext/com_dotnet/com_dotnet.c
@@ -205,7 +205,7 @@ PHP_FUNCTION(com_dotnet_create_instance)
                        snprintf(buf, sizeof(buf), "Failed to init .Net runtime [%s] %s", where, err);
                        php_win32_error_msg_free(err);
                        php_com_throw_exception(hr, buf);
-                       return;
+                       RETURN_THROWS();
                }
                stuff = (struct dotnet_runtime_stuff*)COMG(dotnet_runtime_stuff);
 
@@ -219,7 +219,7 @@ PHP_FUNCTION(com_dotnet_create_instance)
                        php_win32_error_msg_free(err);
                        php_com_throw_exception(hr, buf);
                        ZVAL_NULL(object);
-                       return;
+                       RETURN_THROWS();
                }
 
                where = "QI: System._AppDomain";
@@ -231,7 +231,7 @@ PHP_FUNCTION(com_dotnet_create_instance)
                        php_win32_error_msg_free(err);
                        php_com_throw_exception(hr, buf);
                        ZVAL_NULL(object);
-                       return;
+                       RETURN_THROWS();
                }
        }
 
@@ -247,7 +247,7 @@ PHP_FUNCTION(com_dotnet_create_instance)
        cp_it = php_win32_cp_get_by_id((DWORD)cp);
        if (!cp_it) {
                php_com_throw_exception(E_INVALIDARG, "Could not create .Net object - invalid codepage!");
-               return;
+               RETURN_THROWS();
        }
        obj->code_page = (int)cp_it->id;
 
@@ -311,7 +311,7 @@ PHP_FUNCTION(com_dotnet_create_instance)
                snprintf(buf, sizeof(buf), "Failed to instantiate .Net object [%s] [0x%08x] %s", where, hr, err);
                php_win32_error_msg_free(err);
                php_com_throw_exception(hr, buf);
-               return;
+               RETURN_THROWS();
        }
 }
 /* }}} */

diff --git a/ext/com_dotnet/com_persist.c b/ext/com_dotnet/com_persist.c
index 9710972a86ee7f373eceffb758a971b313fc4dd2..521f67f121062955a0cae10c9fedf036059cd45e 100644 (file)
--- a/ext/com_dotnet/com_persist.c
+++ b/ext/com_dotnet/com_persist.c
@@ -289,7 +289,7 @@ PHP_COM_DOTNET_API IStream *php_com_wrapper_export_stream(php_stream *stream)
 
 #define CPH_FETCH()                            php_com_persist_helper *helper = (php_com_persist_helper*)Z_OBJ_P(getThis());
 
-#define CPH_NO_OBJ()                   if (helper->unk == NULL) { php_com_throw_exception(E_INVALIDARG, "No COM object is associated with this helper instance"); return; }
+#define CPH_NO_OBJ()                   if (helper->unk == NULL) { php_com_throw_exception(E_INVALIDARG, "No COM object is associated with this helper instance"); RETURN_THROWS(); }
 
 typedef struct {
        zend_object                     std;
@@ -490,7 +490,7 @@ CPH_METHOD(GetMaxStreamSize)
                        res = IPersistStream_GetSizeMax(helper->ips, &size);
                } else {
                        php_com_throw_exception(res, NULL);
-                       return;
+                       RETURN_THROWS();
                }
        }
 
@@ -545,13 +545,13 @@ CPH_METHOD(LoadFromStream)
 
        if (stream == NULL) {
                php_com_throw_exception(E_INVALIDARG, "expected a stream");
-               return;
+               RETURN_THROWS();
        }
 
        stm = php_com_wrapper_export_stream(stream);
        if (stm == NULL) {
                php_com_throw_exception(E_UNEXPECTED, "failed to wrap stream");
-               return;
+               RETURN_THROWS();
        }
 
        res = S_OK;
@@ -581,7 +581,7 @@ CPH_METHOD(LoadFromStream)
 
        if (FAILED(res)) {
                php_com_throw_exception(res, NULL);
-               RETURN_NULL();
+               RETURN_THROWS();
        }
 }
 /* }}} */
@@ -606,13 +606,13 @@ CPH_METHOD(SaveToStream)
 
        if (stream == NULL) {
                php_com_throw_exception(E_INVALIDARG, "expected a stream");
-               return;
+               RETURN_THROWS();
        }
 
        stm = php_com_wrapper_export_stream(stream);
        if (stm == NULL) {
                php_com_throw_exception(E_UNEXPECTED, "failed to wrap stream");
-               return;
+               RETURN_THROWS();
        }
 
        res = get_persist_stream_init(helper);
@@ -629,7 +629,7 @@ CPH_METHOD(SaveToStream)
 
        if (FAILED(res)) {
                php_com_throw_exception(res, NULL);
-               return;
+               RETURN_THROWS();
        }
 
        RETURN_TRUE;
@@ -657,7 +657,7 @@ CPH_METHOD(__construct)
 
        if (V_VT(&obj->v) != VT_DISPATCH || V_DISPATCH(&obj->v) == NULL) {
                php_com_throw_exception(E_INVALIDARG, "parameter must represent an IDispatch COM object");
-               return;
+               RETURN_THROWS();
        }
 
        /* it is always safe to cast an interface to IUnknown */

diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c
index 2a545e12217acc3281f35d0ba80b11dbe5972a1a..bc4c7950e04a0aee6e835697c1d8c0cb29ef7b50 100644 (file)
--- a/ext/com_dotnet/com_variant.c
+++ b/ext/com_dotnet/com_variant.c
@@ -589,7 +589,7 @@ static void variant_binary_operation(enum variant_binary_opcode op, INTERNAL_FUN
                php_com_variant_from_zval(vright, zright, codepage);
 
        } else {
-               return;
+               RETURN_THROWS();
        }
 
        switch (op) {
@@ -775,7 +775,7 @@ static void variant_unary_operation(enum variant_unary_opcode op, INTERNAL_FUNCT
                vleft = &left_val;
                php_com_variant_from_zval(vleft, zleft, codepage);
        } else {
-               return;
+               RETURN_THROWS();
        }
 
        switch (op) {
@@ -873,7 +873,7 @@ PHP_FUNCTION(variant_round)
                vleft = &left_val;
                php_com_variant_from_zval(vleft, zleft, codepage);
        } else {
-               return;
+               RETURN_THROWS();
        }
 
        if (SUCCEEDED(VarRound(vleft, (int)decimals, &vres))) {
@@ -933,7 +933,7 @@ PHP_FUNCTION(variant_cmp)
                php_com_variant_from_zval(vright, zright, codepage);
 
        } else {
-               return;
+               RETURN_THROWS();
        }
 
        ZVAL_LONG(return_value, VarCmp(vleft, vright, (LCID)lcid, (ULONG)flags));

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index c723ed25b4620d78adb523cc49e743eed26b9aca..6c151fbba9d76a41f4a1167ddcc9dd56b860c5cd 100644 (file)
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -598,7 +598,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
        /* Exception during string conversion */
        if (EG(exception)) {
                FREENOW;
-               return;
+               RETURN_THROWS();
        }
 
        if (persistent) {

diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
index 8848dc70311bbdbe169ae9d425d15281d1854cc4..f4becaac465adf20826832f1177840d4ff70ff8b 100644 (file)
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
@@ -660,7 +660,7 @@ PHP_FUNCTION(enchant_dict_quick_check)
        if (sugg) {
                sugg = zend_try_array_init(sugg);
                if (!sugg) {
-                       return;
+                       RETURN_THROWS();
                }
        }
 

diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c
index 25dd1d95d4599cf39d8b2fead03e4cdf1b2104a0..3545687ecac09a13f55cc20ded7cc48c6666f529 100644 (file)
--- a/ext/ffi/ffi.c
+++ b/ext/ffi/ffi.c
@@ -2796,7 +2796,7 @@ static zend_always_inline int zend_ffi_validate_api_restriction(zend_execute_dat
 
 #define ZEND_FFI_VALIDATE_API_RESTRICTION() do { \
                if (UNEXPECTED(!zend_ffi_validate_api_restriction(execute_data))) { \
-                       return; \
+                       RETURN_THROWS(); \
                } \
        } while (0)
 

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 9714f3bc38cfad22c234496ea3e68d95cebd61ad..8791940089c02c9fb19a26ea5f1820a3ce562a4f 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -3342,7 +3342,7 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
        zval *SIM;      \
        gdImagePtr im_src;      \
        if (zend_parse_parameters(1, "O", &SIM, gd_image_ce) == FAILURE) {      \
-               return; \
+               RETURN_THROWS();        \
        }       \
        im_src = php_gd_libgdimageptr_from_zval_p(SIM);
 

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 5f0560257370b042c02a619e6a4e066bccc273fb..7267632dd40fd7e5a9a67dc893e378b24d6e5b26 100644 (file)
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -2438,8 +2438,9 @@ PHP_FUNCTION(iconv_set_encoding)
        size_t type_len, retval;
        zend_string *name;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS(), "sS", &type, &type_len, &charset) == FAILURE)
-               return;
+       if (zend_parse_parameters(ZEND_NUM_ARGS(), "sS", &type, &type_len, &charset) == FAILURE) {
+               RETURN_THROWS();
+       }
 
        if (ZSTR_LEN(charset) >= ICONV_CSNMAXLEN) {
                php_error_docref(NULL, E_WARNING, "Charset parameter exceeds the maximum allowed length of %d characters", ICONV_CSNMAXLEN);

diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c
index d59239b6ca9601d6ae34b2a52e22d75c9f759233..4ea012a0551bec5f07f6d3da9a7cc1c1caa95481 100644 (file)
--- a/ext/intl/idn/idn.c
+++ b/ext/intl/idn/idn.c
@@ -204,7 +204,7 @@ static void php_intl_idn_handoff(INTERNAL_FUNCTION_PARAMETERS, int mode)
        if (idna_info != NULL) {
                idna_info = zend_try_array_init(idna_info);
                if (!idna_info) {
-                       return;
+                       RETURN_THROWS();
                }
        }
 

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 6b21e472f1356b590a3ed0ee8f10442e8a96e73f..be462ed1dc4111caea1cf091fbce6e710d297174 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -622,7 +622,7 @@ static void _php_ldap_controls_to_array(LDAP *ld, LDAPControl** ctrls, zval* arr
 
        array = zend_try_array_init(array);
        if (!array) {
-               return;
+               RETURN_THROWS();
        }
 
        if (ctrls == NULL) {
@@ -3277,7 +3277,7 @@ PHP_FUNCTION(ldap_set_option)
                        zend_string *val;
                        val = zval_get_string(newval);
                        if (EG(exception)) {
-                               return;
+                               RETURN_THROWS();
                        }
                        if (ldap_set_option(ldap, option, ZSTR_VAL(val))) {
                                zend_string_release(val);
@@ -3376,7 +3376,7 @@ PHP_FUNCTION(ldap_parse_result)
                case 6:
                        referrals = zend_try_array_init(referrals);
                        if (!referrals) {
-                               return;
+                               RETURN_THROWS();
                        }
                        if (lreferrals != NULL) {
                                refp = lreferrals;
@@ -3559,7 +3559,7 @@ PHP_FUNCTION(ldap_parse_reference)
 
        referrals = zend_try_array_init(referrals);
        if (!referrals) {
-               return;
+               RETURN_THROWS();
        }
 
        if (lreferrals != NULL) {

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 0b97bf97ea490541e64d5be14e3ecf8f38175278..a0dbb3a30ea9eeddadd2abf6585a5eaf2af13685 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1750,7 +1750,7 @@ PHP_FUNCTION(mb_parse_str)
 
        track_vars_array = zend_try_array_init(track_vars_array);
        if (!track_vars_array) {
-               return;
+               RETURN_THROWS();
        }
 
        encstr = estrndup(encstr, encstr_len);

diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
index 39fc77bdb78eb4a2b9ae5d0f229348877d068377..c43644a2d5fb24d5d4b9b87128aae2ebc301a32d 100644 (file)
--- a/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@ -903,7 +903,7 @@ static void _php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAMETERS, int icase)
        if (array != NULL) {
                array = zend_try_array_init(array);
                if (!array) {
-                       return;
+                       RETURN_THROWS();
                }
        }
 

diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
index 29177028f2b1bb1fa8b365c194faa289f381ee74..08d94b509467c3b3e8c9123e26c7ae4c590e8e4b 100644 (file)
--- a/ext/oci8/oci8_interface.c
+++ b/ext/oci8/oci8_interface.c
@@ -1491,7 +1491,7 @@ PHP_FUNCTION(oci_fetch_all)
                /* Fetch by Row: array will contain one sub-array per query row */
                array = zend_try_array_init(array);
                if (!array) {
-                       return;
+                       RETURN_THROWS();
                }
 
                columns = safe_emalloc(statement->ncolumns, sizeof(php_oci_out_column *), 0);
@@ -1535,7 +1535,7 @@ PHP_FUNCTION(oci_fetch_all)
                /* Fetch by columns: array will contain one sub-array per query column */
                array = zend_try_array_init_size(array, statement->ncolumns);
                if (!array) {
-                       return;
+                       RETURN_THROWS();
                }
 
                columns = safe_emalloc(statement->ncolumns, sizeof(php_oci_out_column *), 0);

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 790d2533596e6e5eaebf088cbef63503b20e82ec..160682510f363eade4fcb996bb449eb375dad3af 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -1640,7 +1640,7 @@ PHP_FUNCTION(odbc_fetch_into)
 
        pv_res_arr = zend_try_array_init(pv_res_arr);
        if (!pv_res_arr) {
-               return;
+               RETURN_THROWS();
        }
 
 #ifdef HAVE_SQL_EXTENDED_FETCH

diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 4405de2a411e60ffd842d4142eeb204d71309030..17f49ce243c382007e27356fc966b88918a238c8 100644 (file)
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -605,7 +605,7 @@ PHP_FUNCTION(pcntl_waitpid)
        if (z_rusage) {
                z_rusage = zend_try_array_init(z_rusage);
                if (!z_rusage) {
-                       return;
+                       RETURN_THROWS();
                }
 
                memset(&rusage, 0, sizeof(struct rusage));
@@ -654,7 +654,7 @@ PHP_FUNCTION(pcntl_wait)
        if (z_rusage) {
                z_rusage = zend_try_array_init(z_rusage);
                if (!z_rusage) {
-                       return;
+                       RETURN_THROWS();
                }
 
                memset(&rusage, 0, sizeof(struct rusage));
@@ -1084,7 +1084,7 @@ PHP_FUNCTION(pcntl_sigprocmask)
        if (user_oldset != NULL) {
                user_oldset = zend_try_array_init(user_oldset);
                if (!user_oldset) {
-                       return;
+                       RETURN_THROWS();
                }
 
                for (signo = 1; signo < NSIG; ++signo) {

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 4182d41cd3781316d4a538ad31e3713d6c945924..595ff409e4784a1e96e2cb1c93ad2ad54ec5ec06 100644 (file)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -1759,7 +1759,7 @@ PHP_METHOD(Phar, buildFromDirectory)
        zval_ptr_dtor(&arg);
        if (EG(exception)) {
                zval_ptr_dtor(&iter);
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
 
        if (SUCCESS != object_init_ex(&iteriter, spl_ce_RecursiveIteratorIterator)) {
@@ -1775,7 +1775,7 @@ PHP_METHOD(Phar, buildFromDirectory)
        if (EG(exception)) {
                zval_ptr_dtor(&iter);
                zval_ptr_dtor(&iteriter);
-               RETURN_FALSE;
+               RETURN_THROWS();
        }
 
        zval_ptr_dtor(&iter);

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index a97331d53a73d66aae190dea428fe7cb330edf3c..240ea4473c929f7670445626f7b00e0a37d7d9c4 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -1352,7 +1352,7 @@ static void _reflection_export(INTERNAL_FUNCTION_PARAMETERS, zend_class_entry *c
 
        if (EG(exception)) {
                zval_ptr_dtor(&reflector);
-               return;
+               RETURN_THROWS();
        }
        if (result == FAILURE) {
                zval_ptr_dtor(&reflector);
@@ -5185,7 +5185,7 @@ ZEND_METHOD(reflection_class, getExtensionName)
        zend_class_entry *ce;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        GET_REFLECTION_OBJECT_PTR(ce);
@@ -6300,7 +6300,7 @@ ZEND_METHOD(reflection_reference, getId)
 
        if (!REFLECTION_G(key_initialized)) {
                if (php_random_bytes_throw(&REFLECTION_G(key_initialized), 16) == FAILURE) {
-                       return;
+                       RETURN_THROWS();
                }
 
                REFLECTION_G(key_initialized) = 1;

diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 0f421535b828e7becf7125623e774b8e0a393304..3cede8417dc07bf9a33a87b7d8be6425c977c763 100644 (file)
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -1867,7 +1867,7 @@ PHP_METHOD(SoapServer, addSoapHeader)
        SOAP_SERVER_BEGIN_CODE();
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &fault, soap_header_class_entry) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        FETCH_THIS_SERVICE(service);
@@ -2137,7 +2137,7 @@ PHP_METHOD(SoapClient, __construct)
        zval *this_ptr = ZEND_THIS;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|a", &wsdl, &options) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        SOAP_CLIENT_BEGIN_CODE();
@@ -2688,7 +2688,7 @@ PHP_METHOD(SoapClient, __call)
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "sa|a!zz",
                &function, &function_len, &args, &options, &headers, &output_headers) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if (options) {
@@ -2787,7 +2787,7 @@ PHP_METHOD(SoapClient, __getFunctions)
        FETCH_THIS_SDL(sdl);
 
        if (zend_parse_parameters_none() == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if (sdl) {
@@ -2814,7 +2814,7 @@ PHP_METHOD(SoapClient, __getTypes)
        FETCH_THIS_SDL(sdl);
 
        if (zend_parse_parameters_none() == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if (sdl) {
@@ -2841,7 +2841,7 @@ PHP_METHOD(SoapClient, __getLastRequest)
        zval *tmp;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(ZEND_THIS), "__last_request", sizeof("__last_request")-1)) != NULL &&
@@ -2860,7 +2860,7 @@ PHP_METHOD(SoapClient, __getLastResponse)
        zval *tmp;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(ZEND_THIS), "__last_response", sizeof("__last_response")-1)) != NULL &&
@@ -2879,7 +2879,7 @@ PHP_METHOD(SoapClient, __getLastRequestHeaders)
        zval *tmp;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(ZEND_THIS), "__last_request_headers", sizeof("__last_request_headers")-1)) != NULL &&
@@ -2898,7 +2898,7 @@ PHP_METHOD(SoapClient, __getLastResponseHeaders)
        zval *tmp;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(ZEND_THIS), "__last_response_headers", sizeof("__last_response_headers")-1)) != NULL &&
@@ -2926,7 +2926,7 @@ PHP_METHOD(SoapClient, __doRequest)
            &location, &location_size,
            &action, &action_size,
            &version, &one_way) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
        if (SOAP_GLOBAL(features) & SOAP_WAIT_ONE_WAY_CALLS) {
                one_way = 0;
@@ -2956,7 +2956,7 @@ PHP_METHOD(SoapClient, __setCookie)
        zval *this_ptr = ZEND_THIS;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|s!", &name, &name_len, &val, &val_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if (val == NULL) {
@@ -2989,7 +2989,7 @@ PHP_METHOD(SoapClient, __getCookies)
        zval *cookies;
 
        if (zend_parse_parameters_none() == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
 
@@ -3012,7 +3012,7 @@ PHP_METHOD(SoapClient, __setSoapHeaders)
        zval *this_ptr = ZEND_THIS;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "|z", &headers) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if (headers == NULL || Z_TYPE_P(headers) == IS_NULL) {
@@ -3050,7 +3050,7 @@ PHP_METHOD(SoapClient, __setLocation)
        zval *this_ptr = ZEND_THIS;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &location, &location_len) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        if ((tmp = zend_hash_str_find(Z_OBJPROP_P(this_ptr), "location", sizeof("location")-1)) != NULL && Z_TYPE_P(tmp) == IS_STRING) {

diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c
index 64f585a6a6f9545258d5abbbbc10130fe446211c..e3c302f5c4422c6882407dffec454c95db3e8a4b 100644 (file)
--- a/ext/sockets/sendrecvmsg.c
+++ b/ext/sockets/sendrecvmsg.c
@@ -181,7 +181,7 @@ PHP_FUNCTION(socket_sendmsg)
 
        if ((php_sock = (php_socket *)zend_fetch_resource(Z_RES_P(zsocket),
                                        php_sockets_le_socket_name, php_sockets_le_socket())) == NULL) {
-               return;
+               RETURN_THROWS();
        }
 
        msghdr = from_zval_run_conversions(zmsg, php_sock, from_zval_write_msghdr_send,

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 0812cb9d4c38571c392d2665237f1ad33353e0db..322355c3c1fdd7830c26fea4975afaa9a886828d 100644 (file)
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -2068,7 +2068,7 @@ PHP_FUNCTION(socket_create_pair)
        if (!fds_array_zval) {
                efree(php_sock[0]);
                efree(php_sock[1]);
-               return;
+               RETURN_THROWS();
        }
 
        php_sock[0]->bsd_socket = fds_array[0];

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index 51a94ac5a4e1da52c9086368143876ed0ea0abda..5e021ce493ea697657a48541af48cf1f95c3ae63 100644 (file)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -1942,7 +1942,7 @@ SPL_METHOD(CallbackFilterIterator, accept)
        }
 
        if (EG(exception)) {
-               RETURN_NULL();
+               RETURN_THROWS();
        }
 
        /* zend_call_function may change args to IS_REF */
@@ -1984,7 +1984,7 @@ SPL_METHOD(RegexIterator, accept)
 
        /* Exception during string conversion. */
        if (EG(exception)) {
-               return;
+               RETURN_THROWS();
        }
 
        switch (intern->u.regex.mode)

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 70b793a9059e9406089301680fd3f003208361a0..37b7d3cadb447c8f4e4acf531f337e63007e260f 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -787,7 +787,7 @@ PHP_FUNCTION(count)
                                        return;
                                }
                                if (EG(exception)) {
-                                       return;
+                                       RETURN_THROWS();
                                }
                        }
                        /* if not and the object implements Countable we call its count() method */

diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index 45603d1bd45dc71f8759452d71cf250502dd3905..70c24856898d8765981356547d9126a86f179c32 100644 (file)
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -833,13 +833,13 @@ PHP_FUNCTION(dns_get_record)
        if (authns) {
                authns = zend_try_array_init(authns);
                if (!authns) {
-                       return;
+                       RETURN_THROWS();
                }
        }
        if (addtl) {
                addtl = zend_try_array_init(addtl);
                if (!addtl) {
-                       return;
+                       RETURN_THROWS();
                }
        }
 
@@ -1069,13 +1069,13 @@ PHP_FUNCTION(dns_get_mx)
 
        mx_list = zend_try_array_init(mx_list);
        if (!mx_list) {
-               return;
+               RETURN_THROWS();
        }
 
        if (weight_list) {
                weight_list = zend_try_array_init(weight_list);
                if (!weight_list) {
-                       return;
+                       RETURN_THROWS();
                }
        }
 

diff --git a/ext/standard/dns_win32.c b/ext/standard/dns_win32.c
index c33116a3ab9c7be13394b225c2e680e4b323c07f..b1cf4986fda1599116fcf8efd48b24783593b357 100644 (file)
--- a/ext/standard/dns_win32.c
+++ b/ext/standard/dns_win32.c
@@ -363,13 +363,13 @@ PHP_FUNCTION(dns_get_record)
        if (authns) {
                authns = zend_try_array_init(authns);
                if (!authns) {
-                       return;
+                       RETURN_THROWS();
                }
        }
        if (addtl) {
                addtl = zend_try_array_init(addtl);
                if (!addtl) {
-                       return;
+                       RETURN_THROWS();
                }
        }
 

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index 4825fc02a5c546f7686acf5019a78d7e19a24959..d343abcd00f1dcb385d3a97f7ce0f17333a043c7 100644 (file)
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -236,7 +236,7 @@ static void php_exec_ex(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
                } else {
                        ret_array = zend_try_array_init(ret_array);
                        if (!ret_array) {
-                               return;
+                               RETURN_THROWS();
                        }
                }
 

diff --git a/ext/standard/image.c b/ext/standard/image.c
index 64264107101af15b8d162fd9c99d130ccb36bc08..d543e4d594f36636f7fe2a47997a0bbd64d3af6f 100644 (file)
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -1497,7 +1497,7 @@ static void php_getimagesize_from_any(INTERNAL_FUNCTION_PARAMETERS, int mode) {
        if (argc == 2) {
                info = zend_try_array_init(info);
                if (!info) {
-                       return;
+                       RETURN_THROWS();
                }
        }
 

diff --git a/ext/standard/random.c b/ext/standard/random.c
index 9a3e1b33a032f1a674cea5c70f7e8ffce00a6a5b..a887d97e8a874ae6ffb7061ab72b5174c638911e 100644 (file)
--- a/ext/standard/random.c
+++ b/ext/standard/random.c
@@ -213,7 +213,7 @@ PHP_FUNCTION(random_bytes)
 
        if (php_random_bytes_throw(ZSTR_VAL(bytes), size) == FAILURE) {
                zend_string_release_ex(bytes, 0);
-               return;
+               RETURN_THROWS();
        }
 
        ZSTR_VAL(bytes)[size] = '\0';

diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index effe97c7304d263963cb0fe5c13e9fcd5f3609c6..88875c051f1fad20492d3261938910941e5f8c15 100644 (file)
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -1089,7 +1089,7 @@ PHP_FUNCTION(stream_context_get_default)
 
        if (params) {
                if (parse_context_options(context, params) == FAILURE) {
-                       return;
+                       RETURN_THROWS();
                }
        }
 
@@ -1114,7 +1114,7 @@ PHP_FUNCTION(stream_context_set_default)
        context = FG(default_context);
 
        if (parse_context_options(context, options) == FAILURE) {
-               return;
+               RETURN_THROWS();
        }
 
        php_stream_context_to_zval(context, return_value);

diff --git a/ext/standard/string.c b/ext/standard/string.c
index d2cc1bb4a1159fd1f60ee1341e16fd7c8e6beb14..17e0abf75e6e73929bd7c961979b455fead4d26b 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2271,7 +2271,7 @@ PHP_FUNCTION(substr_replace)
        if (Z_TYPE_P(from) != IS_ARRAY) {
                convert_to_long_ex(from);
                if (EG(exception)) {
-                       return;
+                       RETURN_THROWS();
                }
        }
 
@@ -4316,7 +4316,7 @@ static void php_str_replace_common(INTERNAL_FUNCTION_PARAMETERS, int case_sensit
        }
 
        if (EG(exception)) {
-               return;
+               RETURN_THROWS();
        }
 
        /* if subject is an array */
@@ -4794,7 +4794,7 @@ PHP_FUNCTION(parse_str)
 
        arrayArg = zend_try_array_init(arrayArg);
        if (!arrayArg) {
-               return;
+               RETURN_THROWS();
        }
 
        res = estrndup(arg, arglen);

diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c
index 8c1cbbd0517081545052d05da7b46f87815a3c51..dd8d12efba6acb77de00096e5e05e2038fdd9909 100644 (file)
--- a/ext/standard/user_filters.c
+++ b/ext/standard/user_filters.c
@@ -433,7 +433,7 @@ static void php_stream_bucket_attach(int append, INTERNAL_FUNCTION_PARAMETERS)
        }
 
        if ((bucket = (php_stream_bucket *)zend_fetch_resource_ex(pzbucket, PHP_STREAM_BUCKET_RES_NAME, le_bucket)) == NULL) {
-               return;
+               RETURN_THROWS();
        }
 
        if (NULL != (pzdata = zend_hash_str_find(Z_OBJPROP_P(zobject), "data", sizeof("data")-1)) && Z_TYPE_P(pzdata) == IS_STRING) {

diff --git a/ext/standard/var.c b/ext/standard/var.c
index ff493e74dbdeaee3f2ebb96cb71b00b8031091a4..815caaff865acd8ad3c7b0488158685fd0eee9ba 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -1135,7 +1135,7 @@ PHP_FUNCTION(serialize)
 
        if (EG(exception)) {
                smart_str_free(&buf);
-               return;
+               RETURN_THROWS();
        }
 
        if (buf.s) {

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 322c510d56fd2b8899dfe252b4a4fa1d58cf0993..e764f48fdef97e50a75cf3b489979519cae4dc13 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -1352,13 +1352,13 @@ PHP_FUNCTION(xml_parse_into_struct)
        if (info) {
                info = zend_try_array_init(info);
                if (!info) {
-                       return;
+                       RETURN_THROWS();
                }
        }
 
        xdata = zend_try_array_init(xdata);
        if (!xdata) {
-               return;
+               RETURN_THROWS();
        }
 
        ZVAL_COPY_VALUE(&parser->data, xdata);