Skip to content

Commit a003af5

Browse files
committed
Add missing skip conditions
mbstring can be built without mbregex support, in which case these tests would fail. Thus we add respective skip conditions.
1 parent 70ecb6e commit a003af5

File tree

12 files changed

+36
-8
lines changed

12 files changed

+36
-8
lines changed

ext/mbstring/tests/bug43301.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
Bug #43301 (mb_ereg*_replace() crashes when replacement string is invalid PHP expression and 'e' option is used)
33
--SKIPIF--
4-
<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
4+
<?php
5+
extension_loaded('mbstring') or die('skip mbstring not available');
6+
if (!function_exists('mb_ereg')) die('skip mbregex support not available');
7+
?>
58
--FILE--
69
<?php
710

ext/mbstring/tests/bug69151.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
Bug #69151 (mb_ereg should reject ill-formed byte sequence)
33
--SKIPIF--
4-
<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
4+
<?php
5+
extension_loaded('mbstring') or die('skip mbstring not available');
6+
if (!function_exists('mb_ereg')) die('skip mbregex support not available');
7+
?>
58
--FILE--
69
<?php
710
$str = "\x80";

ext/mbstring/tests/bug72164.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
Bug #72164 (Null Pointer Dereference - mb_ereg_replace)
33
--SKIPIF--
4-
<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
4+
<?php
5+
extension_loaded('mbstring') or die('skip mbstring not available');
6+
if (!function_exists('mb_ereg')) die('skip mbregex support not available');
7+
?>
58
--FILE--
69
<?php
710
$var0 = "e";

ext/mbstring/tests/bug72399.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
Bug #72399 (Use-After-Free in MBString (search_re))
33
--SKIPIF--
4-
<?php require 'skipif.inc'; ?>
4+
<?php
5+
require 'skipif.inc';
6+
if (!function_exists('mb_ereg')) die('skip mbregex support not available');
7+
?>
58
--FILE--
69
<?php
710
$var5 = mb_ereg_search_init("","2");

ext/mbstring/tests/bug72402.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
Bug #72402: _php_mb_regex_ereg_replace_exec - double free
33
--SKIPIF--
4-
<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
4+
<?php
5+
extension_loaded('mbstring') or die('skip mbstring not available');
6+
if (!function_exists('mb_ereg')) die('skip mbregex support not available');
7+
?>
58
--FILE--
69
<?php
710
function throwit() {

ext/mbstring/tests/bug72691.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Bug #72691 (mb_ereg_search raises a warning if a match zero-width)
33
--SKIPIF--
44
<?php
55
if (!extension_loaded('mbstring')) die('skip ext/mbstring required');
6+
if (!function_exists('mb_ereg')) die('skip mbregex support not available');
67
?>
78
--FILE--
89
<?php

ext/mbstring/tests/bug72693.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Bug #72693 (mb_ereg_search increments search position when a match zero-width)
33
--SKIPIF--
44
<?php
55
if (!extension_loaded('mbstring')) die('skip ext/mbstring required');
6+
if (!function_exists('mb_ereg')) die('skip mbregex support not available');
67
?>
78
--FILE--
89
<?php

ext/mbstring/tests/bug72694.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Bug #72694 (mb_ereg_search_setpos does not accept a string's last position)
33
--SKIPIF--
44
<?php
55
if (!extension_loaded('mbstring')) die('skip ext/mbstring required');
6+
if (!function_exists('mb_ereg')) die('skip mbregex support not available');
67
?>
78
--FILE--
89
<?php

ext/mbstring/tests/bug72710.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Bug #72710 (`mb_ereg` causes buffer overflow on regexp compile error)
33
--SKIPIF--
44
<?php
55
if (!extension_loaded('mbstring')) die('skip ext/mbstring required');
6+
if (!function_exists('mb_ereg')) die('skip mbregex support not available');
67
?>
78
--FILE--
89
<?php

ext/mbstring/tests/bug73532.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
--TEST--
22
Bug #73532 (Null pointer dereference in mb_eregi)
33
--SKIPIF--
4-
<?php require 'skipif.inc'; ?>
4+
<?php
5+
require 'skipif.inc';
6+
if (!function_exists('mb_ereg')) die('skip mbregex support not available');
7+
?>
58
--FILE--
69
<?php
710
var_dump(mb_eregi("a", "\xf5"));

0 commit comments

Comments
 (0)