From 1a4b715ef262bafb1b8823b54ec567a0912c83ce Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Tue, 8 Aug 2006 10:22:25 +0000 Subject: [PATCH] use memrchr/zend_memrchr instead of strrchr --- ext/standard/string.c | 8 ++++---- ext/standard/tests/strings/strings001.phpt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/standard/string.c b/ext/standard/string.c index 6ab8e008c0..06a4c88eb2 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1382,7 +1382,7 @@ PHP_FUNCTION(pathinfo) php_basename(path, path_len, NULL, 0, &ret, &ret_len TSRMLS_CC); } - p = strrchr(ret, '.'); + p = zend_memrchr(ret, '.', ret_len); if (p) { idx = p - ret; @@ -1399,7 +1399,7 @@ PHP_FUNCTION(pathinfo) php_basename(path, path_len, NULL, 0, &ret, &ret_len TSRMLS_CC); } - p = strrchr(ret, '.'); + p = zend_memrchr(ret, '.', ret_len); idx = p ? (p - ret) : ret_len; add_assoc_stringl(tmp, "filename", ret, idx, 1); @@ -1871,10 +1871,10 @@ PHP_FUNCTION(strrchr) convert_to_string_ex(haystack); if (Z_TYPE_PP(needle) == IS_STRING) { - found = strrchr(Z_STRVAL_PP(haystack), *Z_STRVAL_PP(needle)); + found = zend_memrchr(Z_STRVAL_PP(haystack), *Z_STRVAL_PP(needle), Z_STRLEN_PP(haystack)); } else { convert_to_long_ex(needle); - found = strrchr(Z_STRVAL_PP(haystack), (char) Z_LVAL_PP(needle)); + found = zend_memrchr(Z_STRVAL_PP(haystack), (char) Z_LVAL_PP(needle), Z_STRLEN_PP(haystack)); } if (found) { diff --git a/ext/standard/tests/strings/strings001.phpt b/ext/standard/tests/strings/strings001.phpt index 87f8489b8a..70b709295d 100644 --- a/ext/standard/tests/strings/strings001.phpt +++ b/ext/standard/tests/strings/strings001.phpt @@ -9,4 +9,4 @@ var_dump(strrchr($s," nic")); ?> --EXPECTREGEX-- string\(18\) \"nica\x00turska panica\" -string\(19\) \" nica\x00turska panica\" +string\(7\) \" panica\" -- 2.50.1