Use RETURN_THROWS() after try_convert_to_string()

kocsismate · kocsismate · commit 7b4a4d2ace00 · 2020-01-03T17:04:06.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -164,7 +164,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_enumeration)
 		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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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));

Original file line number	Diff line number	Diff line change
`@@ -1693,7 +1693,7 @@ PHP_FUNCTION(imap_delete)`
`1693`	`1693`	`}`
`1694`	`1694`
`1695`	`1695`	`if (!try_convert_to_string(sequence)) {`
`1696`		`- return;`
	`1696`	`+ RETURN_THROWS();`
`1697`	`1697`	`}`
`1698`	`1698`
`1699`	`1699`	`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)`
`1719`	`1719`	`}`
`1720`	`1720`
`1721`	`1721`	`if (!try_convert_to_string(sequence)) {`
`1722`		`- return;`
	`1722`	`+ RETURN_THROWS();`
`1723`	`1723`	`}`
`1724`	`1724`
`1725`	`1725`	`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)`
`2140`	`2140`
`2141`	`2141`	`default:`
`2142`	`2142`	`if (!try_convert_to_string(out)) {`
`2143`		`- return;`
	`2143`	`+ RETURN_THROWS();`
`2144`	`2144`	`}`
`2145`	`2145`	`writer = php_stream_open_wrapper(Z_STRVAL_P(out), "wb", REPORT_ERRORS, NULL);`
`2146`	`2146`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ U_CFUNC PHP_FUNCTION(datefmt_format_object)`
`141`	`141`	`dateStyle = timeStyle = (DateFormat::EStyle)Z_LVAL_P(format);`
`142`	`142`	`} else {`
`143`	`143`	`if (!try_convert_to_string(format)) {`
`144`		`- return;`
	`144`	`+ RETURN_THROWS();`
`145`	`145`	`}`
`146`	`146`	`if (Z_STRLEN_P(format) == 0) {`
`147`	`147`	`intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ U_CFUNC PHP_FUNCTION(intltz_create_enumeration)`
`164`	`164`	`zend_long lval;`
`165`	`165`	`double dval;`
`166`	`166`	`if (!try_convert_to_string(arg)) {`
`167`		`- return;`
	`167`	`+ RETURN_THROWS();`
`168`	`168`	`}`
`169`	`169`	`switch (is_numeric_string(Z_STRVAL_P(arg), Z_STRLEN_P(arg), &lval, &dval, 0)) {`
`170`	`170`	`case IS_DOUBLE:`
Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ PHP_FUNCTION( transliterator_transliterate )`
`316`	`316`	`{ /* not a transliterator object as first argument */`
`317`	`317`	`int res;`
`318`	`318`	`if( !try_convert_to_string( arg1 ) ) {`
`319`		`- return;`
	`319`	`+ RETURN_THROWS();`
`320`	`320`	`}`
`321`	`321`	`object = &tmp_object;`
`322`	`322`	`res = create_transliterator( Z_STRVAL_P( arg1 ), Z_STRLEN_P( arg1 ),`
Original file line number	Diff line number	Diff line change
`@@ -1095,7 +1095,7 @@ PHP_FUNCTION(odbc_execute)`
`1095`	`1095`	`}`
`1096`	`1096`	`}`
`1097`	`1097`	`efree(params);`
`1098`		`- RETURN_FALSE;`
	`1098`	`+ RETURN_THROWS();`
`1099`	`1099`	`}`
`1100`	`1100`
`1101`	`1101`	`params[i-1].vallen = Z_STRLEN_P(tmp);`
Original file line number	Diff line number	Diff line change
`@@ -592,7 +592,7 @@ static PHP_METHOD(PDO, pgsqlCopyFromArray)`
`592`	`592`	`size_t query_len;`
`593`	`593`	`if (!try_convert_to_string(tmp)) {`
`594`	`594`	`efree(query);`
`595`		`- return;`
	`595`	`+ RETURN_THROWS();`
`596`	`596`	`}`
`597`	`597`
`598`	`598`	`if (buffer_len < Z_STRLEN_P(tmp)) {`