diff options
Diffstat (limited to 'win32/codepage.c')
| -rw-r--r-- | win32/codepage.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/win32/codepage.c b/win32/codepage.c index 12c3afc531..15614dc4d4 100644 --- a/win32/codepage.c +++ b/win32/codepage.c @@ -653,7 +653,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) { @@ -674,7 +676,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) { |