clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

- str_pad(): Use u_countChar32() for codepoint counting, eumalloc/eurealloc() for Unicode mallocs.

Browse Source
This commit is contained in:
Rolland Santimano 2005-09-09 19:07:18 +00:00
parent 4c8425e9ba
commit 05e365bab3
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/standard/string.c
View File

@ -5394,10 +5394,7 @@ PHP_FUNCTION(str_pad)
if (input_type == IS_UNICODE) {
/* For Unicode, num_pad_chars/pad_length is number of codepoints */
i = 0; input_codepts = 0;
while (i < input_len) {
U16_FWD_1((UChar *)input, i, input_len);
input_codepts++;
}
input_codepts = u_countChar32((UChar *)input, input_len);
num_pad_chars = pad_length - input_codepts;
} else {
num_pad_chars = pad_length - input_len;
@ -5439,7 +5436,7 @@ PHP_FUNCTION(str_pad)
}
if (input_type == IS_UNICODE) {
result = emalloc(UBYTES(input_len + num_pad_chars*2 + 1));
result = eumalloc(input_len + num_pad_chars*2 + 1);
} else {
result = emalloc(input_len + num_pad_chars + 1);
}
@ -5481,7 +5478,7 @@ PHP_FUNCTION(str_pad)
result_len += zend_codepoint_to_uchar(ch, (UChar *)result + result_len);
}
*((UChar *)result + result_len) = 0;
result = erealloc(result, UBYTES(result_len+1));
result = eurealloc(result, result_len+1);
} else {
for (i = 0; i < left_pad; i++)
*((char *)result + result_len++) = *((char *)padstr + (i % padstr_len));