Use RETURN_THROWS() after try_convert_to_string()

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index f7339292a489e368982829b8f16d569782e68e1c..ff23b67764030c407530f283f5a064c0e749704d 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -4434,7 +4434,7 @@ PHP_FUNCTION(exif_read_data)
                ret = exif_read_from_stream(&ImageInfo, p_stream, read_thumbnail, read_all);
        } else {
                if (!try_convert_to_string(stream)) {
-                       return;
+                       RETURN_THROWS();
                }
 
                if (!Z_STRLEN_P(stream)) {
@@ -4607,7 +4607,7 @@ PHP_FUNCTION(exif_thumbnail)
                ret = exif_read_from_stream(&ImageInfo, p_stream, 1, 0);
        } else {
                if (!try_convert_to_string(stream)) {
-                       return;
+                       RETURN_THROWS();
                }
 
                if (!Z_STRLEN_P(stream)) {

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index ec23bda52b6ee3a540320d22ebe5a0b988842dd6..3c477c69b28594093ec445e4d2573267b5993d9f 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -1693,7 +1693,7 @@ PHP_FUNCTION(imap_delete)
        }
 
        if (!try_convert_to_string(sequence)) {
-               return;
+               RETURN_THROWS();
        }
 
        mail_setflag_full(imap_le_struct->imap_stream, Z_STRVAL_P(sequence), "\\DELETED", (argc == 3 ? flags : NIL));
@@ -1719,7 +1719,7 @@ PHP_FUNCTION(imap_undelete)
        }
 
        if (!try_convert_to_string(sequence)) {
-               return;
+               RETURN_THROWS();
        }
 
        mail_clearflag_full(imap_le_struct->imap_stream, Z_STRVAL_P(sequence), "\\DELETED", (argc == 3 ? flags : NIL));
@@ -2140,7 +2140,7 @@ PHP_FUNCTION(imap_savebody)
 
                default:
                        if (!try_convert_to_string(out)) {
-                               return;
+                               RETURN_THROWS();
                        }
                        writer = php_stream_open_wrapper(Z_STRVAL_P(out), "wb", REPORT_ERRORS, NULL);
                break;

diff --git a/ext/intl/dateformat/dateformat_format_object.cpp b/ext/intl/dateformat/dateformat_format_object.cpp
index 3d784a997c787fce00652d6f5ed7b262ac047e7c..9723006b1582b80a3d585ecee7ba28f1b1bacc19 100644 (file)
--- a/ext/intl/dateformat/dateformat_format_object.cpp
+++ b/ext/intl/dateformat/dateformat_format_object.cpp
@@ -141,7 +141,7 @@ U_CFUNC PHP_FUNCTION(datefmt_format_object)
                dateStyle = timeStyle = (DateFormat::EStyle)Z_LVAL_P(format);
        } else {
                if (!try_convert_to_string(format)) {
-                       return;
+                       RETURN_THROWS();
                }
                if (Z_STRLEN_P(format) == 0) {
                        intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,

diff --git a/ext/intl/timezone/timezone_methods.cpp b/ext/intl/timezone/timezone_methods.cpp
index d7f426dcb13bb4dd9fd1d75a57db0dda705d2a99..d11d8433c6eeeaf61b75b5fbe9bd9178457d322a 100644 (file)
--- a/ext/intl/timezone/timezone_methods.cpp
+++ b/ext/intl/timezone/timezone_methods.cpp
@@ -164,7 +164,7 @@ double_offset:
                zend_long lval;
                double dval;
                if (!try_convert_to_string(arg)) {
-                       return;
+                       RETURN_THROWS();
                }
                switch (is_numeric_string(Z_STRVAL_P(arg), Z_STRLEN_P(arg), &lval, &dval, 0)) {
                case IS_DOUBLE:

diff --git a/ext/intl/transliterator/transliterator_methods.c b/ext/intl/transliterator/transliterator_methods.c
index db3634f075da6c12c4a33535de1a93c843f0207c..fcf788d7dac9864ae13447d8b85e243e4e5db437 100644 (file)
--- a/ext/intl/transliterator/transliterator_methods.c
+++ b/ext/intl/transliterator/transliterator_methods.c
@@ -316,7 +316,7 @@ PHP_FUNCTION( transliterator_transliterate )
                { /* not a transliterator object as first argument */
                        int res;
                        if( !try_convert_to_string( arg1 ) ) {
-                               return;
+                               RETURN_THROWS();
                        }
                        object = &tmp_object;
                        res = create_transliterator( Z_STRVAL_P( arg1 ), Z_STRLEN_P( arg1 ),

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 37e7e6b7a9e469f5589ecec880152a1f2bb47a43..0b97bf97ea490541e64d5be14e3ecf8f38175278 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1600,7 +1600,7 @@ PHP_FUNCTION(mb_detect_order)
                                break;
                        default:
                                if (!try_convert_to_string(arg1)) {
-                                       return;
+                                       RETURN_THROWS();
                                }
                                if (FAILURE == php_mb_parse_encoding_list(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1), &list, &size, 0)) {
                                        if (list) {
@@ -2878,7 +2878,7 @@ PHP_FUNCTION(mb_convert_encoding)
 
        if (Z_TYPE_P(input) != IS_STRING && Z_TYPE_P(input) != IS_ARRAY) {
                if (!try_convert_to_string(input)) {
-                       return;
+                       RETURN_THROWS();
                }
        }
 
@@ -2917,7 +2917,7 @@ PHP_FUNCTION(mb_convert_encoding)
                                break;
                        default:
                                if (!try_convert_to_string(arg_old)) {
-                                       return;
+                                       RETURN_THROWS();
                                }
 
                                _from_encodings = Z_STRVAL_P(arg_old);
@@ -3096,7 +3096,7 @@ PHP_FUNCTION(mb_detect_encoding)
                        break;
                default:
                        if (!try_convert_to_string(encoding_list)) {
-                               return;
+                               RETURN_THROWS();
                        }
                        if (FAILURE == php_mb_parse_encoding_list(Z_STRVAL_P(encoding_list), Z_STRLEN_P(encoding_list), &list, &size, 0)) {
                                if (list) {
@@ -3507,7 +3507,7 @@ PHP_FUNCTION(mb_convert_variables)
                        break;
                default:
                        if (!try_convert_to_string(zfrom_enc)) {
-                               return;
+                               RETURN_THROWS();
                        }
                        php_mb_parse_encoding_list(Z_STRVAL_P(zfrom_enc), Z_STRLEN_P(zfrom_enc), &elist, &elistsz, 0);
                        break;
@@ -4464,7 +4464,7 @@ PHP_FUNCTION(mb_check_encoding)
                }
        } else {
                if (!try_convert_to_string(input)) {
-                       RETURN_FALSE;
+                       RETURN_THROWS();
                }
                if (!php_mb_check_encoding(Z_STRVAL_P(input), Z_STRLEN_P(input), enc ? ZSTR_VAL(enc): NULL)) {
                        RETURN_FALSE;

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 05c1a729c37fde3656888ed36b1864c8211d8beb..4a5e7c992ae9b7ee86a18901f808243aabaeb432 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -898,7 +898,7 @@ PHP_FUNCTION(mysqli_stmt_execute)
                                switch (stmt->stmt->params[i].buffer_type) {
                                        case MYSQL_TYPE_VAR_STRING:
                                                if (!try_convert_to_string(param)) {
-                                                       return;
+                                                       RETURN_THROWS();
                                                }
 
                                                stmt->stmt->params[i].buffer = Z_STRVAL_P(param);
@@ -1791,7 +1791,7 @@ PHP_FUNCTION(mysqli_options)
                switch (expected_type) {
                        case IS_STRING:
                                if (!try_convert_to_string(mysql_value)) {
-                                       return;
+                                       RETURN_THROWS();
                                }
                                break;
                        case IS_LONG:

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 67a51feb3f5037250ddea42ea9415da0bce65a50..6fdee0f22522ca81fbd180c0245c01bbe21b8c96 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -1095,7 +1095,7 @@ PHP_FUNCTION(odbc_execute)
                                        }
                                }
                                efree(params);
-                               RETURN_FALSE;
+                               RETURN_THROWS();
                        }
 
                        params[i-1].vallen = Z_STRLEN_P(tmp);

diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 70a9fec402ab9a5346fd70e1ede33298cdbe4412..4405de2a411e60ffd842d4142eeb204d71309030 100644 (file)
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -862,7 +862,7 @@ PHP_FUNCTION(pcntl_exec)
                        if (argi >= argc) break;
                        if (!try_convert_to_string(element)) {
                                efree(argv);
-                               return;
+                               RETURN_THROWS();
                        }
 
                        *current_arg = Z_STRVAL_P(element);
@@ -895,7 +895,7 @@ PHP_FUNCTION(pcntl_exec)
                                zend_string_release(key);
                                efree(argv);
                                efree(envp);
-                               return;
+                               RETURN_THROWS();
                        }
 
                        /* Length of element + equal sign + length of key + null */

diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
index e91dc8aecd92f77183cb88883962aa43014e46e9..63eb38c7590f32b533117851ad001d430f806cd8 100644 (file)
--- a/ext/pdo_pgsql/pgsql_driver.c
+++ b/ext/pdo_pgsql/pgsql_driver.c
@@ -592,7 +592,7 @@ static PHP_METHOD(PDO, pgsqlCopyFromArray)
                        size_t query_len;
                        if (!try_convert_to_string(tmp)) {
                                efree(query);
-                               return;
+                               RETURN_THROWS();
                        }
 
                        if (buffer_len < Z_STRLEN_P(tmp)) {

diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 77d3855498b9891c7c84ee3e11aba9f40458781c..8a82f67c8531eea306250550cb4dd71a5e499a0c 100644 (file)
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -223,7 +223,7 @@ PHP_FUNCTION(readline_info)
                        if (value) {
                                /* XXX if (rl_line_buffer) free(rl_line_buffer); */
                                if (!try_convert_to_string(value)) {
-                                       return;
+                                       RETURN_THROWS();
                                }
                                rl_line_buffer = strdup(Z_STRVAL_P(value));
                        }
@@ -248,7 +248,7 @@ PHP_FUNCTION(readline_info)
                        oldval = rl_pending_input;
                        if (value) {
                                if (!try_convert_to_string(value)) {
-                                       return;
+                                       RETURN_THROWS();
                                }
                                rl_pending_input = Z_STRVAL_P(value)[0];
                        }
@@ -267,7 +267,7 @@ PHP_FUNCTION(readline_info)
                        oldval = rl_completion_append_character;
                        if (value) {
                                if (!try_convert_to_string(value)) {
-                                       return;
+                                       RETURN_THROWS();
                                }
                                rl_completion_append_character = (int)Z_STRVAL_P(value)[0];
                        }
@@ -292,7 +292,7 @@ PHP_FUNCTION(readline_info)
                        if (value) {
                                /* XXX if (rl_readline_name) free(rl_readline_name); */
                                if (!try_convert_to_string(value)) {
-                                       return;
+                                       RETURN_THROWS();
                                }
                                rl_readline_name = strdup(Z_STRVAL_P(value));
                        }

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index d062d20539cc9accc1a61876f8d622bc2217e5c6..a97331d53a73d66aae190dea428fe7cb330edf3c 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -3802,7 +3802,7 @@ static void reflection_class_object_ctor(INTERNAL_FUNCTION_PARAMETERS, int is_ob
                }
        } else {
                if (!try_convert_to_string(argument)) {
-                       return;
+                       RETURN_THROWS();
                }
 
                if ((ce = zend_lookup_class(Z_STR_P(argument))) == NULL) {

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 8f1907f3beec86ff71312c4ed9c8fff368ce7fb7..ef903be1e9c5b61728c04e545f2cb1e050129c41 100755 (executable)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -2717,7 +2717,7 @@ PHP_FUNCTION(highlight_string)
        ZEND_PARSE_PARAMETERS_END();
 
        if (!try_convert_to_string(expr)) {
-               return;
+               RETURN_THROWS();
        }
 
        if (i) {

diff --git a/ext/standard/math.c b/ext/standard/math.c
index 5b9fa98b735c13aa658f8d0d36a986949aaefd09..a97e781fd0ac6b69f5651d60bb808bbc81f20de9 100644 (file)
--- a/ext/standard/math.c
+++ b/ext/standard/math.c
@@ -1001,7 +1001,7 @@ PHP_FUNCTION(base_convert)
        ZEND_PARSE_PARAMETERS_END();
 
        if (!try_convert_to_string(number)) {
-               return;
+               RETURN_THROWS();
        }
 
        if (frombase < 2 || frombase > 36) {

diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index c3bcf8d2e6484f6256d777157ed499aab4fb550c..94e8a304e750c6e422ded1b41566295220493281 100644 (file)
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -298,7 +298,7 @@ PHP_FUNCTION(pack)
                                        if (!try_convert_to_string(&argv[currentarg])) {
                                                efree(formatcodes);
                                                efree(formatargs);
-                                               return;
+                                               RETURN_THROWS();
                                        }
 
                                        arg = Z_STRLEN(argv[currentarg]);

diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 31e9c141d8926b7871d9a65e825248c9b121b2d4..6aea1a7b9a0307bec029f6f1022bb9a7a9084dc1 100644 (file)
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -1576,7 +1576,7 @@ PHP_FUNCTION(stream_is_local)
                wrapper = stream->wrapper;
        } else {
                if (!try_convert_to_string(zstream)) {
-                       return;
+                       RETURN_THROWS();
                }
 
                wrapper = php_stream_locate_url_wrapper(Z_STRVAL_P(zstream), NULL, 0);

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index e0b3f73f458ba4e354dade7f24f1f4207f992eb3..322c510d56fd2b8899dfe252b4a4fa1d58cf0993 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -1514,7 +1514,7 @@ PHP_FUNCTION(xml_parser_set_option)
                case PHP_XML_OPTION_TARGET_ENCODING: {
                        const xml_encoding *enc;
                        if (!try_convert_to_string(val)) {
-                               return;
+                               RETURN_THROWS();
                        }
 
                        enc = xml_get_encoding((XML_Char*)Z_STRVAL_P(val));