From ec39e9646c943d90e627ba24c27651c27a284b75 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Mon, 29 Jul 2019 13:19:16 -0700 Subject: [PATCH] Merge branch 'PHP-7.1' into PHP-7.2 * PHP-7.1: Fix #77919: Potential UAF in Phar RSHUTDOWN Update NEWS Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment) Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail) --- ext/exif/exif.c | 6 +++--- ext/exif/tests/bug78222.jpg | Bin 0 -> 91 bytes ext/exif/tests/bug78222.phpt | 11 +++++++++++ ext/exif/tests/bug78256.jpg | Bin 0 -> 69 bytes ext/exif/tests/bug78256.phpt | 11 +++++++++++ ext/phar/phar_object.c | 4 +++- ext/phar/tests/bug71488.phpt | 5 ++++- 7 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 ext/exif/tests/bug78222.jpg create mode 100644 ext/exif/tests/bug78222.phpt create mode 100644 ext/exif/tests/bug78256.jpg create mode 100644 ext/exif/tests/bug78256.phpt diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 6f91dda8c2..aaa2e019a5 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -3040,11 +3040,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; @@ -3919,7 +3919,7 @@ static int exif_scan_thumbnail(image_info_type *ImageInfo) size_t length=2, pos=0; jpeg_sof_info sof_info; - if (!data) { + if (!data || ImageInfo->Thumbnail.size < 4) { return FALSE; /* nothing to do here */ } if (memcmp(data, "\xFF\xD8\xFF", 3)) { diff --git a/ext/exif/tests/bug78222.jpg b/ext/exif/tests/bug78222.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a96e16be51eba71945e71f4eb83c33bf6c8ef964 GIT binary patch literal 91 zcmex=;~_(+Yei-n1B0(GgBAk=1CId^0BHsWAqHk9CI&_zi; +--FILE-- + +DONE +--EXPECTF-- +DONE \ No newline at end of file diff --git a/ext/exif/tests/bug78256.jpg b/ext/exif/tests/bug78256.jpg new file mode 100644 index 0000000000000000000000000000000000000000..56bf6726293f6688cf20da5797d83d835685ee0d GIT binary patch literal 69 zcmex=;~|5SYei-n1B0(GgBAk=1CId^Fff5h1_lnGh{2>bpa_I*1QLgVP(M#+e-~E< E00IXM3IG5A literal 0 HcmV?d00001 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-- + +--FILE-- + +DONE +--EXPECTF-- +DONE \ No newline at end of file diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 88619663f1..2669413fe6 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -2037,7 +2037,7 @@ static zend_object *phar_rename_archive(phar_archive_data **sphar, char *ext) /* char *newname = NULL, *newpath = NULL; zval ret, arg1; zend_class_entry *ce; - char *error; + char *error = NULL; const char *pcr_error; int ext_len = ext ? strlen(ext) : 0; size_t new_len, oldname_len, phar_ext_len; @@ -2252,6 +2252,8 @@ its_ok: phar_flush(phar, 0, 0, 1, &error); if (error) { + zend_hash_str_del(&(PHAR_G(phar_fname_map)), newpath, phar->fname_len); + *sphar = NULL; zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "%s", error); efree(error); efree(oldpath); diff --git a/ext/phar/tests/bug71488.phpt b/ext/phar/tests/bug71488.phpt index 9c58d89488..7f8f6c00af 100644 --- a/ext/phar/tests/bug71488.phpt +++ b/ext/phar/tests/bug71488.phpt @@ -15,4 +15,7 @@ DONE ?> --EXPECTF-- Fatal error: Uncaught BadMethodCallException: tar-based phar "%s/bug71488.test" cannot be created, link "%s" is too long for format in %sbug71488.php:%d -Stack trace:%A \ No newline at end of file +Stack trace: +#0 %s(%d): PharData->decompress('test') +#1 {main} + thrown in %s on line %d -- 2.50.1