archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Allow exceptions in __toString()

Browse source 
RFC: https://wiki.php.net/rfc/tostring_exceptions

And convert some object to string conversion related recoverable
fatal errors into Error exceptions.

Improve exception safety of internal code performing string
conversions.
This commit is contained in:
Nikita Popov 2019-02-26 15:32:18 +01:00
parent 528aa7932a
commit a31f46421d
113 changed files with 1402 additions and 486 deletions
Download patch file Download diff file Expand all files Collapse all files

8
win32/codepage.c
View file

@ -657,7 +657,9 @@ PHP_FUNCTION(sapi_windows_cp_conv)
RETURN_NULL();
}
} else {
convert_to_string(z_in_cp);
if (!try_convert_to_string(z_in_cp)) {
return;
}
in_cp = php_win32_cp_get_by_enc(Z_STRVAL_P(z_in_cp));
if (!in_cp) {
@ -678,7 +680,9 @@ PHP_FUNCTION(sapi_windows_cp_conv)
RETURN_NULL();
}
} else {
convert_to_string(z_out_cp);
if (!try_convert_to_string(z_out_cp)) {
return;
}
out_cp = php_win32_cp_get_by_enc(Z_STRVAL_P(z_out_cp));
if (!out_cp) {