diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-08 14:12:50 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-08 14:12:50 +0200 |
| commit | d1de1777e9fcc2aa641f321aaf7b0fc9f7773e38 (patch) | |
| tree | 285022dd5c16c5bc9cbdc16e6cd267669cb13f8f | |
| parent | 196f9697ef0062577e82c51f4cc4904ee3ce6f06 (diff) | |
| parent | 9fd555f99e3385e91a65b6145eb403908a629759 (diff) | |
| download | php-git-d1de1777e9fcc2aa641f321aaf7b0fc9f7773e38.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add missing SKIPIFs in exif tests
| -rw-r--r-- | ext/exif/tests/duplicate_copyright_tag_leak.phpt | 6 | ||||
| -rw-r--r-- | ext/exif/tests/tag_with_illegal_zero_components.phpt | 6 | ||||
| -rw-r--r-- | ext/exif/tests/temporary_buffer_leak.phpt | 6 | ||||
| -rw-r--r-- | ext/exif/tests/zero_length_makernote_leak.phpt | 6 |
4 files changed, 24 insertions, 0 deletions
diff --git a/ext/exif/tests/duplicate_copyright_tag_leak.phpt b/ext/exif/tests/duplicate_copyright_tag_leak.phpt index c5d5019794..3a4eccf142 100644 --- a/ext/exif/tests/duplicate_copyright_tag_leak.phpt +++ b/ext/exif/tests/duplicate_copyright_tag_leak.phpt @@ -1,5 +1,11 @@ --TEST-- OSS-Fuzz #17474: Memory leak on duplicate Copyright tags +--SKIPIF-- +<?php +if (!extension_loaded('exif')) { + die('skip exif extension not available'); +} +?> --FILE-- <?php diff --git a/ext/exif/tests/tag_with_illegal_zero_components.phpt b/ext/exif/tests/tag_with_illegal_zero_components.phpt index 26422db7ca..f3e434ed10 100644 --- a/ext/exif/tests/tag_with_illegal_zero_components.phpt +++ b/ext/exif/tests/tag_with_illegal_zero_components.phpt @@ -1,5 +1,11 @@ --TEST-- OSS-Fuzz #17163: Out-of-bounds read due to tag with zero components +--SKIPIF-- +<?php +if (!extension_loaded('exif')) { + die('skip exif extension not available'); +} +?> --FILE-- <?php diff --git a/ext/exif/tests/temporary_buffer_leak.phpt b/ext/exif/tests/temporary_buffer_leak.phpt index cf136dd648..fe7fe1d8a7 100644 --- a/ext/exif/tests/temporary_buffer_leak.phpt +++ b/ext/exif/tests/temporary_buffer_leak.phpt @@ -1,5 +1,11 @@ --TEST-- OSS-Fuzz: Temporary buffer leak in tag reading +--SKIPIF-- +<?php +if (!extension_loaded('exif')) { + die('skip exif extension not available'); +} +?> --FILE-- <?php diff --git a/ext/exif/tests/zero_length_makernote_leak.phpt b/ext/exif/tests/zero_length_makernote_leak.phpt index 37d0e0c573..246e267ddc 100644 --- a/ext/exif/tests/zero_length_makernote_leak.phpt +++ b/ext/exif/tests/zero_length_makernote_leak.phpt @@ -1,5 +1,11 @@ --TEST-- OSS-Fuzz: Memory leak for zero-length MAKERNOTE +--SKIPIF-- +<?php +if (!extension_loaded('exif')) { + die('skip exif extension not available'); +} +?> --FILE-- <?php |