diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-26 15:32:18 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-05 14:25:07 +0200 |
| commit | a31f46421d7bf6f55dd9ac5876b8e2eacf7e0708 (patch) | |
| tree | 24ffd7c5ae5e321c3994048fdd0fd9f68ae7457c /ext/exif/exif.c | |
| parent | 528aa7932a839fc6319979c34aa372805d8dc41c (diff) | |
| download | php-git-a31f46421d7bf6f55dd9ac5876b8e2eacf7e0708.tar.gz | |
Allow exceptions in __toString()
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.
Diffstat (limited to 'ext/exif/exif.c')
| -rw-r--r-- | ext/exif/exif.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 1fd42fe096..0ec5b1a1b8 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -4419,7 +4419,9 @@ PHP_FUNCTION(exif_read_data) ret = exif_read_from_stream(&ImageInfo, p_stream, read_thumbnail, read_all); } else { - convert_to_string(stream); + if (!try_convert_to_string(stream)) { + return; + } if (!Z_STRLEN_P(stream)) { exif_error_docref(NULL EXIFERR_CC, &ImageInfo, E_WARNING, "Filename cannot be empty"); @@ -4589,7 +4591,9 @@ PHP_FUNCTION(exif_thumbnail) ret = exif_read_from_stream(&ImageInfo, p_stream, 1, 0); } else { - convert_to_string(stream); + if (!try_convert_to_string(stream)) { + return; + } if (!Z_STRLEN_P(stream)) { exif_error_docref(NULL EXIFERR_CC, &ImageInfo, E_WARNING, "Filename cannot be empty"); |