diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-04-23 22:03:33 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-04-23 22:03:33 -0700 |
| commit | 4c06d929c048158a623a6f285af006f8531d372b (patch) | |
| tree | 1fb51d7a72899bf62ff452ea05af5a30f2a00ba0 /ext/exif/exif.c | |
| parent | 83e7618f05cea9ad8ef17dfc5cbf05939a5d63dd (diff) | |
| parent | 95ee9efa572ae7b6931c846833a3283f06610a2e (diff) | |
| download | php-git-4c06d929c048158a623a6f285af006f8531d372b.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix tsrm_ls
Fix #76129 - remove more potential unfiltered outputs for phar
Fix test
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Fix bug #76249 - fail on invalid sequences
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
Fix bug #75981: prevent reading beyond buffer start
Diffstat (limited to 'ext/exif/exif.c')
| -rw-r--r-- | ext/exif/exif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 43bd7a33c3..f5b0d4009f 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -2112,7 +2112,7 @@ static void exif_iif_add_value(image_info_type *image_info, int section_index, c case TAG_FMT_UNDEFINED: if (value) { if (tag == TAG_MAKER_NOTE) { - length = MIN(length, (int) strlen(value)); + length = (int) php_strnlen(value, length); } /* do not recompute length here */ |