diff options
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"); |