From 2cd1661e2d8a87bf900dae6f60c66811cfa3600a Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Mon, 27 Sep 2010 23:09:00 +0000 Subject: [PATCH] - Fixed bug #52931 (strripos not overloaded with function overloading enabled) --- NEWS | 2 ++ ext/mbstring/mbstring.c | 2 +- ext/mbstring/tests/bug52931.phpt | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 ext/mbstring/tests/bug52931.phpt diff --git a/NEWS b/NEWS index d69a709bfe..6d8d00e2b2 100644 --- a/NEWS +++ b/NEWS @@ -21,6 +21,8 @@ - Fixed possible crash in mssql_fetch_batch(). (Kalle) - Fixed inconsistent backlog default value (-1) in FPM on many systems. (fat) +- Fixed bug #52931 (strripos not overloaded with function overloading enabled). + (Felipe) - Fixed bug #52929 (Segfault in filter_var with FILTER_VALIDATE_EMAIL with large amount of data). (Adam) - Fixed bug #52926 (zlib fopen wrapper does not use context). (Gustavo) diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index ef11db31a3..f67d0fb569 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -196,7 +196,7 @@ static const struct mb_overload_def mb_ovld[] = { {MB_OVERLOAD_STRING, "strpos", "mb_strpos", "mb_orig_strpos"}, {MB_OVERLOAD_STRING, "strrpos", "mb_strrpos", "mb_orig_strrpos"}, {MB_OVERLOAD_STRING, "stripos", "mb_stripos", "mb_orig_stripos"}, - {MB_OVERLOAD_STRING, "strripos", "mb_strripos", "mb_orig_stripos"}, + {MB_OVERLOAD_STRING, "strripos", "mb_strripos", "mb_orig_strripos"}, {MB_OVERLOAD_STRING, "strstr", "mb_strstr", "mb_orig_strstr"}, {MB_OVERLOAD_STRING, "strrchr", "mb_strrchr", "mb_orig_strrchr"}, {MB_OVERLOAD_STRING, "stristr", "mb_stristr", "mb_orig_stristr"}, diff --git a/ext/mbstring/tests/bug52931.phpt b/ext/mbstring/tests/bug52931.phpt new file mode 100644 index 0000000000..9669d884cb --- /dev/null +++ b/ext/mbstring/tests/bug52931.phpt @@ -0,0 +1,22 @@ +--TEST-- +Bug #52931 (strripos not overloaded with function overloading enabled) +--INI-- +mbstring.func_overload = 7 +mbstring.internal_encoding = utf-8 +--FILE-- +Umlauttest Ã¶Ã¼Ã¤'; + +var_dump(strlen($string)); +var_dump(mb_strlen($string)); + +var_dump(strripos($string, '')); +var_dump(mb_strripos($string, '')); + +?> +--EXPECTF-- +int(27) +int(27) +int(20) +int(20) -- 2.40.0