summaryrefslogtreecommitdiff
path: root/ext/exif
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2019-10-08 14:12:12 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2019-10-08 14:12:12 +0200
commit9fd555f99e3385e91a65b6145eb403908a629759 (patch)
treeee5410d6be8a2cba67c96ff69ce14b29f0173682 /ext/exif
parent2fdd142f9941a05bdcffb0d6c11662ec333e6e09 (diff)
parent46894580b06c1ba630a804ff0bbb9e61076720f4 (diff)
downloadphp-git-9fd555f99e3385e91a65b6145eb403908a629759.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: Add missing SKIPIFs in exif tests
Diffstat (limited to 'ext/exif')
-rw-r--r--ext/exif/tests/duplicate_copyright_tag_leak.phpt6
-rw-r--r--ext/exif/tests/tag_with_illegal_zero_components.phpt6
-rw-r--r--ext/exif/tests/temporary_buffer_leak.phpt6
-rw-r--r--ext/exif/tests/zero_length_makernote_leak.phpt6
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