mirror of
https://github.com/php/php-src.git
synced 2024-11-24 18:34:21 +08:00
- MFH: fix Bug #45923 (mb_st[r]ripos() offset not handled correctly)
This commit is contained in:
Moriyoshi Koizumi
parent
3a9a83e7bc
commit
9d7250d455
@ -905,7 +905,7 @@ mbfl_strpos(
|
||||
}
|
||||
|
||||
if (offset < 0) {
|
||||
negative_offset = -offset-1;
|
||||
negative_offset = -offset - pc.needle_len;
|
||||
offset = 0;
|
||||
}
|
||||
|
||||
|
||||
@ -2237,12 +2237,12 @@ PHP_FUNCTION(mb_strpos)
|
||||
}
|
||||
}
|
||||
|
||||
if (offset < 0 || (unsigned long)offset > (unsigned long)mbfl_strlen(&haystack)) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string.");
|
||||
if (offset < 0 || offset > mbfl_strlen(&haystack)) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string");
|
||||
RETURN_FALSE;
|
||||
}
|
||||
if (needle.len == 0) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter.");
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter");
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
@ -2254,17 +2254,17 @@ PHP_FUNCTION(mb_strpos)
|
||||
case 1:
|
||||
break;
|
||||
case 2:
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Needle has not positive length.");
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Needle has not positive length");
|
||||
break;
|
||||
case 4:
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding or conversion error.");
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown encoding or conversion error");
|
||||
break;
|
||||
case 8:
|
||||
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Argument is empty.");
|
||||
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Argument is empty");
|
||||
break;
|
||||
default:
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error in mb_strpos.");
|
||||
break;
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error in mb_strpos");
|
||||
break;
|
||||
}
|
||||
RETVAL_FALSE;
|
||||
}
|
||||
@ -2351,10 +2351,13 @@ PHP_FUNCTION(mb_strrpos)
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
if ((offset > 0 && offset > mbfl_strlen(&haystack)) ||
|
||||
(offset < 0 && -offset > mbfl_strlen(&haystack))) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Offset is greater than the length of haystack string");
|
||||
RETURN_FALSE;
|
||||
{
|
||||
int haystack_char_len = mbfl_strlen(&haystack);
|
||||
if ((offset > 0 && offset > haystack_char_len) ||
|
||||
(offset < 0 && -offset > haystack_char_len)) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset is greater than the length of haystack string");
|
||||
RETURN_FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
n = mbfl_strpos(&haystack, &needle, offset, 1);
|
||||
@ -2411,10 +2414,6 @@ PHP_FUNCTION(mb_strripos)
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
if ((unsigned int)offset > haystack.len) {
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
n = php_mb_stripos(1, (char *)haystack.val, haystack.len, (char *)needle.val, needle.len, offset, from_encoding TSRMLS_CC);
|
||||
|
||||
if (n >= 0) {
|
||||
@ -4804,7 +4803,7 @@ MBSTRING_API int php_mb_gpc_encoding_detector(char **arg_string, int *arg_length
|
||||
|
||||
/* {{{ MBSTRING_API int php_mb_stripos()
|
||||
*/
|
||||
MBSTRING_API int php_mb_stripos(int mode, const char *old_haystack, unsigned int old_haystack_len, const char *old_needle, unsigned int old_needle_len, unsigned int offset, const char *from_encoding TSRMLS_DC)
|
||||
MBSTRING_API int php_mb_stripos(int mode, const char *old_haystack, unsigned int old_haystack_len, const char *old_needle, unsigned int old_needle_len, long offset, const char *from_encoding TSRMLS_DC)
|
||||
{
|
||||
int n;
|
||||
mbfl_string haystack, needle;
|
||||
@ -4847,9 +4846,21 @@ MBSTRING_API int php_mb_stripos(int mode, const char *old_haystack, unsigned int
|
||||
break;
|
||||
}
|
||||
|
||||
if (offset < 0 || offset > haystack.len) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string.");
|
||||
break;
|
||||
{
|
||||
int haystack_char_len = mbfl_strlen(&haystack);
|
||||
|
||||
if (mode) {
|
||||
if ((offset > 0 && offset > haystack_char_len) ||
|
||||
(offset < 0 && -offset > haystack_char_len)) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset is greater than the length of haystack string");
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
if (offset < 0 || offset > haystack_char_len) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not contained in string");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
n = mbfl_strpos(&haystack, &needle, offset, mode);
|
||||
|
||||
@ -157,7 +157,7 @@ MBSTRING_API int php_mb_gpc_encoding_converter(char **str, int *len, int num, co
|
||||
|
||||
MBSTRING_API int php_mb_gpc_encoding_detector(char **arg_string, int *arg_length, int num, char *arg_list TSRMLS_DC);
|
||||
|
||||
MBSTRING_API int php_mb_stripos(int mode, const char *old_haystack, unsigned int old_haystack_len, const char *old_needle, unsigned int old_needle_len, unsigned int offset, const char *from_encoding TSRMLS_DC);
|
||||
MBSTRING_API int php_mb_stripos(int mode, const char *old_haystack, unsigned int old_haystack_len, const char *old_needle, unsigned int old_needle_len, long offset, const char *from_encoding TSRMLS_DC);
|
||||
|
||||
ZEND_BEGIN_MODULE_GLOBALS(mbstring)
|
||||
enum mbfl_no_language language;
|
||||
|
||||
202
ext/mbstring/tests/bug45923.phpt
Normal file
202
ext/mbstring/tests/bug45923.phpt
Normal file
@ -0,0 +1,202 @@
|
||||
--TEST--
|
||||
Bug #45923 (mb_st[r]ripos() offset not handled correctly)
|
||||
--SKIPIF--
|
||||
<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
|
||||
--INI--
|
||||
mbstring.internal_encoding=UTF-8
|
||||
--FILE--
|
||||
<?php
|
||||
var_dump(strpos("abc abc abc", "abc", 0));
|
||||
var_dump(strpos("abc abc abc", "abc", 3));
|
||||
var_dump(strpos("abc abc abc", "abc", 6));
|
||||
var_dump(strpos("abc abc abc", "abc", 9));
|
||||
var_dump(strpos("abc abc abc", "abc", 11));
|
||||
var_dump(strpos("abc abc abc", "abc", 12));
|
||||
var_dump(strpos("abc abc abc", "abc", -1));
|
||||
var_dump(strpos("abc abc abc", "abc", -3));
|
||||
var_dump(strpos("abc abc abc", "abc", -6));
|
||||
|
||||
var_dump(mb_strpos("●○◆ ●○◆ ●○◆", "●○◆", 0));
|
||||
var_dump(mb_strpos("●○◆ ●○◆ ●○◆", "●○◆", 3));
|
||||
var_dump(mb_strpos("●○◆ ●○◆ ●○◆", "●○◆", 6));
|
||||
var_dump(mb_strpos("●○◆ ●○◆ ●○◆", "●○◆", 9));
|
||||
var_dump(mb_strpos("●○◆ ●○◆ ●○◆", "●○◆", 11));
|
||||
var_dump(mb_strpos("●○◆ ●○◆ ●○◆", "●○◆", 12));
|
||||
var_dump(mb_strpos("●○◆ ●○◆ ●○◆", "●○◆", -1));
|
||||
var_dump(mb_strpos("●○◆ ●○◆ ●○◆", "●○◆", -3));
|
||||
var_dump(mb_strpos("●○◆ ●○◆ ●○◆", "●○◆", -6));
|
||||
|
||||
var_dump(stripos("abc abc abc", "abc", 0));
|
||||
var_dump(stripos("abc abc abc", "abc", 3));
|
||||
var_dump(stripos("abc abc abc", "abc", 6));
|
||||
var_dump(stripos("abc abc abc", "abc", 9));
|
||||
var_dump(stripos("abc abc abc", "abc", 11));
|
||||
var_dump(stripos("abc abc abc", "abc", 12));
|
||||
var_dump(stripos("abc abc abc", "abc", -1));
|
||||
var_dump(stripos("abc abc abc", "abc", -3));
|
||||
var_dump(stripos("abc abc abc", "abc", -6));
|
||||
|
||||
var_dump(mb_stripos("●○◆ ●○◆ ●○◆", "●○◆", 0));
|
||||
var_dump(mb_stripos("●○◆ ●○◆ ●○◆", "●○◆", 3));
|
||||
var_dump(mb_stripos("●○◆ ●○◆ ●○◆", "●○◆", 6));
|
||||
var_dump(mb_stripos("●○◆ ●○◆ ●○◆", "●○◆", 9));
|
||||
var_dump(mb_stripos("●○◆ ●○◆ ●○◆", "●○◆", 11));
|
||||
var_dump(mb_stripos("●○◆ ●○◆ ●○◆", "●○◆", 12));
|
||||
var_dump(mb_stripos("●○◆ ●○◆ ●○◆", "●○◆", -1));
|
||||
var_dump(mb_stripos("●○◆ ●○◆ ●○◆", "●○◆", -3));
|
||||
var_dump(mb_stripos("●○◆ ●○◆ ●○◆", "●○◆", -6));
|
||||
|
||||
var_dump(strrpos("abc abc abc", "abc", 0));
|
||||
var_dump(strrpos("abc abc abc", "abc", 3));
|
||||
var_dump(strrpos("abc abc abc", "abc", 6));
|
||||
var_dump(strrpos("abc abc abc", "abc", 9));
|
||||
var_dump(strrpos("abc abc abc", "abc", 11));
|
||||
var_dump(strrpos("abc abc abc", "abc", 12));
|
||||
var_dump(strrpos("abc abc abc", "abc", -1));
|
||||
var_dump(strrpos("abc abc abc", "abc", -3));
|
||||
var_dump(strrpos("abc abc abc", "abc", -6));
|
||||
|
||||
var_dump(mb_strrpos("●○◆ ●○◆ ●○◆", "●○◆", 0));
|
||||
var_dump(mb_strrpos("●○◆ ●○◆ ●○◆", "●○◆", 3));
|
||||
var_dump(mb_strrpos("●○◆ ●○◆ ●○◆", "●○◆", 6));
|
||||
var_dump(mb_strrpos("●○◆ ●○◆ ●○◆", "●○◆", 9));
|
||||
var_dump(mb_strrpos("●○◆ ●○◆ ●○◆", "●○◆", 11));
|
||||
var_dump(mb_strrpos("●○◆ ●○◆ ●○◆", "●○◆", 12));
|
||||
var_dump(mb_strrpos("●○◆ ●○◆ ●○◆", "●○◆", -1));
|
||||
var_dump(mb_strrpos("●○◆ ●○◆ ●○◆", "●○◆", -3));
|
||||
var_dump(mb_strrpos("●○◆ ●○◆ ●○◆", "●○◆", -6));
|
||||
|
||||
var_dump(strripos("abc abc abc", "abc", 0));
|
||||
var_dump(strripos("abc abc abc", "abc", 3));
|
||||
var_dump(strripos("abc abc abc", "abc", 6));
|
||||
var_dump(strripos("abc abc abc", "abc", 9));
|
||||
var_dump(strripos("abc abc abc", "abc", 11));
|
||||
var_dump(strripos("abc abc abc", "abc", 12));
|
||||
var_dump(strripos("abc abc abc", "abc", -1));
|
||||
var_dump(strripos("abc abc abc", "abc", -3));
|
||||
var_dump(strripos("abc abc abc", "abc", -6));
|
||||
|
||||
var_dump(mb_strripos("●○◆ ●○◆ ●○◆", "●○◆", 0));
|
||||
var_dump(mb_strripos("●○◆ ●○◆ ●○◆", "●○◆", 3));
|
||||
var_dump(mb_strripos("●○◆ ●○◆ ●○◆", "●○◆", 6));
|
||||
var_dump(mb_strripos("●○◆ ●○◆ ●○◆", "●○◆", 9));
|
||||
var_dump(mb_strripos("●○◆ ●○◆ ●○◆", "●○◆", 11));
|
||||
var_dump(mb_strripos("●○◆ ●○◆ ●○◆", "●○◆", 12));
|
||||
var_dump(mb_strripos("●○◆ ●○◆ ●○◆", "●○◆", -1));
|
||||
var_dump(mb_strripos("●○◆ ●○◆ ●○◆", "●○◆", -3));
|
||||
var_dump(mb_strripos("●○◆ ●○◆ ●○◆", "●○◆", -6));
|
||||
|
||||
?>
|
||||
--EXPECTF--
|
||||
int(0)
|
||||
int(4)
|
||||
int(8)
|
||||
bool(false)
|
||||
bool(false)
|
||||
|
||||
Warning: strpos(): Offset not contained in string in %s on line %d
|
||||
bool(false)
|
||||
|
||||
Warning: strpos(): Offset not contained in string in %s on line %d
|
||||
bool(false)
|
||||
|
||||
Warning: strpos(): Offset not contained in string in %s on line %d
|
||||
bool(false)
|
||||
|
||||
Warning: strpos(): Offset not contained in string in %s on line %d
|
||||
bool(false)
|
||||
int(0)
|
||||
int(4)
|
||||
int(8)
|
||||
bool(false)
|
||||
bool(false)
|
||||
|
||||
Warning: mb_strpos(): Offset not contained in string in %s on line %d
|
||||
bool(false)
|
||||
|
||||
Warning: mb_strpos(): Offset not contained in string in %s on line %d
|
||||
bool(false)
|
||||
|
||||
Warning: mb_strpos(): Offset not contained in string in %s on line %d
|
||||
bool(false)
|
||||
|
||||
Warning: mb_strpos(): Offset not contained in string in %s on line %d
|
||||
bool(false)
|
||||
int(0)
|
||||
int(4)
|
||||
int(8)
|
||||
bool(false)
|
||||
bool(false)
|
||||
|
||||
Warning: stripos(): Offset not contained in string in %s on line %d
|
||||
bool(false)
|
||||
|
||||
Warning: stripos(): Offset not contained in string in %s on line %d
|
||||
bool(false)
|
||||
|
||||
Warning: stripos(): Offset not contained in string in %s on line %d
|
||||
bool(false)
|
||||
|
||||
Warning: stripos(): Offset not contained in string in %s on line %d
|
||||
bool(false)
|
||||
int(0)
|
||||
int(4)
|
||||
int(8)
|
||||
bool(false)
|
||||
bool(false)
|
||||
|
||||
Warning: mb_stripos(): Offset not contained in string in %s on line %d
|
||||
bool(false)
|
||||
|
||||
Warning: mb_stripos(): Offset not contained in string in %s on line %d
|
||||
bool(false)
|
||||
|
||||
Warning: mb_stripos(): Offset not contained in string in %s on line %d
|
||||
bool(false)
|
||||
|
||||
Warning: mb_stripos(): Offset not contained in string in %s on line %d
|
||||
bool(false)
|
||||
int(8)
|
||||
int(8)
|
||||
int(8)
|
||||
bool(false)
|
||||
bool(false)
|
||||
|
||||
Warning: strrpos(): Offset is greater than the length of haystack string in %s on line %d
|
||||
bool(false)
|
||||
int(8)
|
||||
int(8)
|
||||
int(4)
|
||||
int(8)
|
||||
int(8)
|
||||
int(8)
|
||||
bool(false)
|
||||
bool(false)
|
||||
|
||||
Warning: mb_strrpos(): Offset is greater than the length of haystack string in %s on line %d
|
||||
bool(false)
|
||||
int(8)
|
||||
int(8)
|
||||
int(4)
|
||||
int(8)
|
||||
int(8)
|
||||
int(8)
|
||||
bool(false)
|
||||
bool(false)
|
||||
|
||||
Warning: strripos(): Offset is greater than the length of haystack string in %s on line %d
|
||||
bool(false)
|
||||
int(8)
|
||||
int(8)
|
||||
int(4)
|
||||
int(8)
|
||||
int(8)
|
||||
int(8)
|
||||
bool(false)
|
||||
bool(false)
|
||||
|
||||
Warning: mb_strripos(): Offset is greater than the length of haystack string in %s on line %d
|
||||
bool(false)
|
||||
int(8)
|
||||
int(8)
|
||||
int(4)
|
||||
Loading…
Reference in New Issue
Block a user