com php-src: Fixed SKIPIF when --disable-mbregex is used: ext/mbstring/tests/bug43301.phpt ext/mbstring/tests/bug69151.phpt
ext/mbstring/tests/bug72164.phpt ext/mbstring/tests/bug72399.phpt ext/mbstring/tests/bug72402.phpt ext/mbstring/tests/bug72691.phpt
ext/mbstring/tests/bug72693.phpt ext/mbstring/tests/bug72694.phpt ext/mbstring/tests/bug72710.phpt ext/mbstring/tests/bug73532.phpt
ext/mbstring/tests/bug73646.phpt ext/mbstring/tests/bug77370.p

From: Date: Sat, 30 Mar 2019 17:28:33 +0000
Subject: com php-src: Fixed SKIPIF when --disable-mbregex is used: ext/mbstring/tests/bug43301.phpt ext/mbstring/tests/bug69151.phpt
ext/mbstring/tests/bug72164.phpt ext/mbstring/tests/bug72399.phpt ext/mbstring/tests/bug72402.phpt ext/mbstring/tests/bug72691.phpt
ext/mbstring/tests/bug72693.phpt ext/mbstring/tests/bug72694.phpt ext/mbstring/tests/bug72710.phpt ext/mbstring/tests/bug73532.phpt
ext/mbstring/tests/bug73646.phpt ext/mbstring/tests/bug77370.p
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-105417@lists.php.net to get a copy of this message
Commit: 0dbb581cf4d7e99cadda368c9edce5a721dc4036 Author: Matteo Beccati <mbeccati@php.net> Fri, 29 Mar 2019 14:09:39 +0100 Parents: 0aa1a2c8333fb828e8f77a369d0f208c1fcb04e3 Branches: PHP-7.2 PHP-7.3 PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0dbb581cf4d7e99cadda368c9edce5a721dc4036 Log: Fixed SKIPIF when --disable-mbregex is used Changed paths: M ext/mbstring/tests/bug43301.phpt M ext/mbstring/tests/bug69151.phpt M ext/mbstring/tests/bug72164.phpt M ext/mbstring/tests/bug72399.phpt M ext/mbstring/tests/bug72402.phpt M ext/mbstring/tests/bug72691.phpt M ext/mbstring/tests/bug72693.phpt M ext/mbstring/tests/bug72694.phpt M ext/mbstring/tests/bug72710.phpt M ext/mbstring/tests/bug73532.phpt M ext/mbstring/tests/bug73646.phpt M ext/mbstring/tests/bug77370..phpt M ext/mbstring/tests/bug77371.phpt M ext/mbstring/tests/bug77381.phpt M ext/mbstring/tests/bug77418.phpt M ext/mbstring/tests/empty_pattern.phpt M ext/mbstring/tests/mb_ereg_search_pos.phpt M ext/mbstring/tests/mb_ereg_search_setpos.phpt

diff --git a/ext/mbstring/tests/bug43301.phpt b/ext/mbstring/tests/bug43301.phpt index f209bd7..ced7651 100644 --- a/ext/mbstring/tests/bug43301.phpt +++ b/ext/mbstring/tests/bug43301.phpt @@ -1,7 +1,10 @@ --TEST-- Bug #43301 (mb_ereg*_replace() crashes when replacement string is invalid PHP expression and 'e' option is used) --SKIPIF-- -<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> +<?php +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_ereg_replace')) die('skip mb_ereg_replace() not available'); +?> --FILE-- <?php diff --git a/ext/mbstring/tests/bug69151.phpt b/ext/mbstring/tests/bug69151.phpt index 801f27e..3efc62d 100644 --- a/ext/mbstring/tests/bug69151.phpt +++ b/ext/mbstring/tests/bug69151.phpt @@ -1,7 +1,10 @@ --TEST-- Bug #69151 (mb_ereg should reject ill-formed byte sequence) --SKIPIF-- -<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> +<?php +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_ereg')) die('skip mb_ereg() not available'); +?> --FILE-- <?php $str = "\x80"; diff --git a/ext/mbstring/tests/bug72164.phpt b/ext/mbstring/tests/bug72164.phpt index 8666447..17d4026 100644 --- a/ext/mbstring/tests/bug72164.phpt +++ b/ext/mbstring/tests/bug72164.phpt @@ -1,7 +1,10 @@ --TEST-- Bug #72164 (Null Pointer Dereference - mb_ereg_replace) --SKIPIF-- -<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> +<?php +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_ereg_replace')) die('skip mb_ereg_replace() not available'); +?> --FILE-- <?php $var0 = "e"; diff --git a/ext/mbstring/tests/bug72399.phpt b/ext/mbstring/tests/bug72399.phpt index ba6ffb2..bf18025 100644 --- a/ext/mbstring/tests/bug72399.phpt +++ b/ext/mbstring/tests/bug72399.phpt @@ -1,5 +1,10 @@ --TEST-- Bug #72399 (Use-After-Free in MBString (search_re)) +--SKIPIF-- +<?php +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_ereg_replace')) die('skip mb_ereg_replace() not available'); +?> --FILE-- <?php $var5 = mbereg_search_init("","2"); diff --git a/ext/mbstring/tests/bug72402.phpt b/ext/mbstring/tests/bug72402.phpt index 6e3286c..a88da51 100644 --- a/ext/mbstring/tests/bug72402.phpt +++ b/ext/mbstring/tests/bug72402.phpt @@ -1,7 +1,10 @@ --TEST-- Bug #72402: _php_mb_regex_ereg_replace_exec - double free --SKIPIF-- -<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> +<?php +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_ereg_replace_callback')) die('skip mb_ereg_replace_callback() not available'); +?> --FILE-- <?php function throwit() { diff --git a/ext/mbstring/tests/bug72691.phpt b/ext/mbstring/tests/bug72691.phpt index 08f6b15..64fc131 100644 --- a/ext/mbstring/tests/bug72691.phpt +++ b/ext/mbstring/tests/bug72691.phpt @@ -2,7 +2,8 @@ Bug #72691 (mb_ereg_search raises a warning if a match zero-width) --SKIPIF-- <?php -if (!extension_loaded('mbstring')) die('skip ext/mbstring required'); +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available'); ?> --FILE-- <?php diff --git a/ext/mbstring/tests/bug72693.phpt b/ext/mbstring/tests/bug72693.phpt index f269e57..2df2c59 100644 --- a/ext/mbstring/tests/bug72693.phpt +++ b/ext/mbstring/tests/bug72693.phpt @@ -2,7 +2,8 @@ Bug #72693 (mb_ereg_search increments search position when a match zero-width) --SKIPIF-- <?php -if (!extension_loaded('mbstring')) die('skip ext/mbstring required'); +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available'); ?> --FILE-- <?php diff --git a/ext/mbstring/tests/bug72694.phpt b/ext/mbstring/tests/bug72694.phpt index 90f56a3..3d4edbe 100644 --- a/ext/mbstring/tests/bug72694.phpt +++ b/ext/mbstring/tests/bug72694.phpt @@ -2,7 +2,8 @@ Bug #72694 (mb_ereg_search_setpos does not accept a string's last position) --SKIPIF-- <?php -if (!extension_loaded('mbstring')) die('skip ext/mbstring required'); +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available'); ?> --FILE-- <?php diff --git a/ext/mbstring/tests/bug72710.phpt b/ext/mbstring/tests/bug72710.phpt index 19becc5..811cb7f 100644 --- a/ext/mbstring/tests/bug72710.phpt +++ b/ext/mbstring/tests/bug72710.phpt @@ -2,7 +2,8 @@ Bug #72710 (`mb_ereg` causes buffer overflow on regexp compile error) --SKIPIF-- <?php -if (!extension_loaded('mbstring')) die('skip ext/mbstring required'); +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_ereg')) die('skip mb_ereg() not available'); ?> --FILE-- <?php diff --git a/ext/mbstring/tests/bug73532.phpt b/ext/mbstring/tests/bug73532.phpt index 0bc838b..63a73f1 100644 --- a/ext/mbstring/tests/bug73532.phpt +++ b/ext/mbstring/tests/bug73532.phpt @@ -1,5 +1,10 @@ --TEST-- Bug #73532 (Null pointer dereference in mb_eregi) +--SKIPIF-- +<?php +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_eregi')) die('skip mb_eregi() not available'); +?> --FILE-- <?php var_dump(mb_eregi("a", "\xf5")); diff --git a/ext/mbstring/tests/bug73646.phpt b/ext/mbstring/tests/bug73646.phpt index a6aefb2..bac8fd8 100644 --- a/ext/mbstring/tests/bug73646.phpt +++ b/ext/mbstring/tests/bug73646.phpt @@ -1,5 +1,10 @@ --TEST-- Bug #73646 (mb_ereg_search_init null pointer dereference) +--SKIPIF-- +<?php +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available'); +?> --FILE-- <?php diff --git a/ext/mbstring/tests/bug77370.phpt b/ext/mbstring/tests/bug77370.phpt index d16fcd7..365463f 100644 --- a/ext/mbstring/tests/bug77370.phpt +++ b/ext/mbstring/tests/bug77370.phpt @@ -1,7 +1,10 @@ --TEST-- Bug #77370 (Buffer overflow on mb regex functions - fetch_token) --SKIPIF-- -<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> +<?php +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_split')) die('skip mb_split() not available'); +?> --FILE-- <?php var_dump(mb_split(" \xfd","")); diff --git a/ext/mbstring/tests/bug77371.phpt b/ext/mbstring/tests/bug77371.phpt index 25f5ac9..9427a3c 100644 --- a/ext/mbstring/tests/bug77371.phpt +++ b/ext/mbstring/tests/bug77371.phpt @@ -1,7 +1,10 @@ --TEST-- Bug #77371 (heap buffer overflow in mb regex functions - compile_string_node) --SKIPIF-- -<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> +<?php +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_ereg')) die('skip mb_ereg() not available'); +?> --FILE-- <?php var_dump(mb_ereg("()0\xfc00000\xfc00000\xfc00000\xfc","")); diff --git a/ext/mbstring/tests/bug77381.phpt b/ext/mbstring/tests/bug77381.phpt index 9768cd3..5176cc5 100644 --- a/ext/mbstring/tests/bug77381.phpt +++ b/ext/mbstring/tests/bug77381.phpt @@ -1,7 +1,10 @@ --TEST-- Bug #77381 (heap buffer overflow in multibyte match_at) --SKIPIF-- -<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> +<?php +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_ereg')) die('skip mb_ereg() not available'); +?> --FILE-- <?php var_dump(mb_ereg("000||0\xfa","0")); diff --git a/ext/mbstring/tests/bug77418.phpt b/ext/mbstring/tests/bug77418.phpt index 32577bc..4e3130b 100644 --- a/ext/mbstring/tests/bug77418.phpt +++ b/ext/mbstring/tests/bug77418.phpt @@ -1,7 +1,10 @@ --TEST-- Bug #77418 (Heap overflow in utf32be_mbc_to_code) --SKIPIF-- -<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> +<?php +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_split')) die('skip mb_split() not available'); +?> --FILE-- <?php mb_regex_encoding("UTF-32"); diff --git a/ext/mbstring/tests/empty_pattern.phpt b/ext/mbstring/tests/empty_pattern.phpt index 10b0330..c56adfd 100644 --- a/ext/mbstring/tests/empty_pattern.phpt +++ b/ext/mbstring/tests/empty_pattern.phpt @@ -1,7 +1,10 @@ --TEST-- Check for empty pattern --SKIPIF-- -<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?> +<?php +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available'); +?> --FILE-- <?php diff --git a/ext/mbstring/tests/mb_ereg_search_pos.phpt b/ext/mbstring/tests/mb_ereg_search_pos.phpt index df22554..374d008 100644 --- a/ext/mbstring/tests/mb_ereg_search_pos.phpt +++ b/ext/mbstring/tests/mb_ereg_search_pos.phpt @@ -2,7 +2,8 @@ mb_ereg_search_pos() # a test for the basic function of mb_ereg_search_pos --SKIPIF-- <?php -if (!extension_loaded('mbstring')) die('skip mbstring not enabled'); +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available'); ?> --FILE-- <?php diff --git a/ext/mbstring/tests/mb_ereg_search_setpos.phpt b/ext/mbstring/tests/mb_ereg_search_setpos.phpt index 60237f0..601989a 100644 --- a/ext/mbstring/tests/mb_ereg_search_setpos.phpt +++ b/ext/mbstring/tests/mb_ereg_search_setpos.phpt @@ -2,7 +2,8 @@ mb_ereg_search_setpos() function --SKIPIF-- <?php -if (!extension_loaded('mbstring')) die('skip mbstring not enabled'); +if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); +if (!function_exists('mb_ereg_search_init')) die('skip mb_ereg_search_init() not available'); ?> --FILE-- <?php
« previous php.cvs (#105417) next »