Skip to content

Replacement uint => uint32_t #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Replacement uint => uint32_t #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
865daf7
Replacement uint => uint32_t
Jan-E Jun 17, 2019
c373345
zend_hash_sort never fails > php 5.5.0. See https://github.com/php/ph…
Jan-E Jul 7, 2020
b705e28
PHP 8.5: STR_EMPTY_ALLOC() - use ZSTR_EMPTY_ALLOC()
Jan-E Jul 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions ereg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
+----------------------------------------------------------------------+
| Authors: Rasmus Lerdorf <[email protected]> |
| Jim Winstead <[email protected]> |
| Jaakko Hyv�tti <[email protected]> |
| Jaakko Hyvätti <[email protected]> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
Expand Down Expand Up @@ -140,7 +140,8 @@ static int _php_regcomp(regex_t *preg, const char *pattern, int cflags)

if (zend_hash_num_elements(&EREG(ht_rc)) >= EREG_CACHE_SIZE) {
/* easier than dealing with overflow as it happens */
if (EREG(lru_counter) >= (1 << 31) || zend_hash_sort(&EREG(ht_rc), (compare_func_t)ereg_lru_cmp, 0) == FAILURE) {
zend_hash_sort(&EREG(ht_rc), (compare_func_t)ereg_lru_cmp, 0);
if (EREG(lru_counter) >= (1 << 31)) {
zend_hash_clean(&EREG(ht_rc));
EREG(lru_counter) = 0;
} else {
Expand Down Expand Up @@ -294,7 +295,7 @@ static void php_ereg(INTERNAL_FUNCTION_PARAMETERS, int icase)
regex_t re;
regmatch_t *subs;
int err, match_len, string_len;
uint i;
uint32_t i;
int copts = 0;
off_t start, end;
char *buf = NULL;
Expand Down Expand Up @@ -454,7 +455,7 @@ PHP_EREG_API char *php_ereg_replace(const char *pattern, const char *replace, co
1) find out how long the string will be, and allocate buf
2) copy the part before match, replacement and backrefs to buf

Jaakko Hyv�tti <[email protected]>
Jaakko Hyvätti <[email protected]>
*/

new_l = strlen(buf) + subs[0].rm_so; /* part before the match */
Expand Down Expand Up @@ -563,7 +564,11 @@ static void php_do_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase)
if (Z_STRVAL_P(arg_pattern) && Z_STRLEN_P(arg_pattern)) {
pattern = zend_string_copy(Z_STR_P(arg_pattern));
} else {
#if PHP_VERSION_ID >= 80500
pattern = ZSTR_EMPTY_ALLOC();
#else
pattern = STR_EMPTY_ALLOC();
#endif
}
} else {
convert_to_long_ex(arg_pattern);
Expand All @@ -576,7 +581,11 @@ static void php_do_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase)
if (Z_STRVAL_P(arg_replace) && Z_STRLEN_P(arg_replace)) {
replace = zend_string_copy(Z_STR_P(arg_replace));
} else {
#if PHP_VERSION_ID >= 80500
replace = ZSTR_EMPTY_ALLOC();
#else
replace = STR_EMPTY_ALLOC();
#endif
}
} else {
convert_to_long_ex(arg_replace);
Expand All @@ -588,7 +597,11 @@ static void php_do_ereg_replace(INTERNAL_FUNCTION_PARAMETERS, int icase)
if (arg_string) {
string = zend_string_copy(arg_string);
} else {
#if PHP_VERSION_ID >= 80500
string = ZSTR_EMPTY_ALLOC();
#else
string = STR_EMPTY_ALLOC();
#endif
}

/* do the actual work */
Expand Down