diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-09-28 16:57:42 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-10-14 10:51:46 -0700 |
| commit | 4a38cc0a3c4db2ac42a5063df0f6ee1ec70b30ff (patch) | |
| tree | 0534830e500222643d6bd7ad61d4c8001955bc5d /ext/exif | |
| parent | 81b67937e4561b23fa4e1cbbd6a7f1d444772bd6 (diff) | |
| download | php-git-4a38cc0a3c4db2ac42a5063df0f6ee1ec70b30ff.tar.gz | |
Fix bug #68113 (Heap corruption in exif_thumbnail())
Diffstat (limited to 'ext/exif')
| -rw-r--r-- | ext/exif/exif.c | 4 | ||||
| -rwxr-xr-x | ext/exif/tests/bug68113.jpg | bin | 0 -> 368 bytes | |||
| -rw-r--r-- | ext/exif/tests/bug68113.phpt | 17 |
3 files changed, 19 insertions, 2 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 42f8a24102..06e1dae41a 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -2413,11 +2413,11 @@ static void* exif_ifd_make_value(image_info_data *info_data, int motorola_intel data_ptr += 8; break; case TAG_FMT_SINGLE: - memmove(data_ptr, &info_data->value.f, byte_count); + memmove(data_ptr, &info_value->f, 4); data_ptr += 4; break; case TAG_FMT_DOUBLE: - memmove(data_ptr, &info_data->value.d, byte_count); + memmove(data_ptr, &info_value->d, 8); data_ptr += 8; break; } diff --git a/ext/exif/tests/bug68113.jpg b/ext/exif/tests/bug68113.jpg Binary files differnew file mode 100755 index 0000000000..3ce7a620fb --- /dev/null +++ b/ext/exif/tests/bug68113.jpg diff --git a/ext/exif/tests/bug68113.phpt b/ext/exif/tests/bug68113.phpt new file mode 100644 index 0000000000..0fa4c4aca8 --- /dev/null +++ b/ext/exif/tests/bug68113.phpt @@ -0,0 +1,17 @@ +--TEST-- +Bug #68113 (Heap corruption in exif_thumbnail()) +--SKIPIF-- +<?php +extension_loaded("exif") or die("skip need exif"); +?> +--FILE-- +<?php +var_dump(exif_thumbnail(__DIR__."/bug68113.jpg")); +?> +Done +--EXPECTF-- +Warning: exif_thumbnail(bug68113.jpg): File structure corrupted in %s/bug68113.php on line 2 + +Warning: exif_thumbnail(bug68113.jpg): Invalid JPEG file in %s/bug68113.php on line 2 +bool(false) +Done
\ No newline at end of file |
