diff options
author | Stanislav Malyshev <stas@php.net> | 2019-07-07 17:39:59 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2019-07-29 00:53:37 -0700 |
commit | aeb6d13185a2ea4f1496ede2697469faed98ce05 (patch) | |
tree | ebceda8ded556a1f0ac8a4ede3df621a4e3b0b23 | |
parent | dea2989ab8ba87a6180af497b2efaf0527e985c5 (diff) | |
download | php-git-aeb6d13185a2ea4f1496ede2697469faed98ce05.tar.gz |
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
-rw-r--r-- | ext/exif/exif.c | 6 | ||||
-rw-r--r-- | ext/exif/tests/bug78256.jpg | bin | 0 -> 69 bytes | |||
-rw-r--r-- | ext/exif/tests/bug78256.phpt | 11 |
3 files changed, 14 insertions, 3 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index cd7975a9f5..77e4427b48 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -2619,7 +2619,7 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP { int a; char *decode; - size_t len;; + size_t len; *pszEncoding = NULL; /* Copy the comment */ @@ -2632,11 +2632,11 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP /* First try to detect BOM: ZERO WIDTH NOBREAK SPACE (FEFF 16) * since we have no encoding support for the BOM yet we skip that. */ - if (!memcmp(szValuePtr, "\xFE\xFF", 2)) { + if (ByteCount >=2 && !memcmp(szValuePtr, "\xFE\xFF", 2)) { decode = "UCS-2BE"; szValuePtr = szValuePtr+2; ByteCount -= 2; - } else if (!memcmp(szValuePtr, "\xFF\xFE", 2)) { + } else if (ByteCount >=2 && !memcmp(szValuePtr, "\xFF\xFE", 2)) { decode = "UCS-2LE"; szValuePtr = szValuePtr+2; ByteCount -= 2; diff --git a/ext/exif/tests/bug78256.jpg b/ext/exif/tests/bug78256.jpg Binary files differnew file mode 100644 index 0000000000..56bf672629 --- /dev/null +++ b/ext/exif/tests/bug78256.jpg diff --git a/ext/exif/tests/bug78256.phpt b/ext/exif/tests/bug78256.phpt new file mode 100644 index 0000000000..37a3f1d824 --- /dev/null +++ b/ext/exif/tests/bug78256.phpt @@ -0,0 +1,11 @@ +--TEST-- +Bug #78256 (heap-buffer-overflow on exif_process_user_comment) +--SKIPIF-- +<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?> +--FILE-- +<?php +@exif_read_data(__DIR__."/bug78256.jpg", 'COMMENT', FALSE, TRUE); +?> +DONE +--EXPECTF-- +DONE
\ No newline at end of file |