com php-src: fixed str_split(): ext/standard/string .c
| From: | Anatol Belski | Date: | Wed, 16 Oct 2013 10:09:41 +0000 |
| Subject: | com php-src: fixed str_split(): ext/standard/string .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73486@lists.php.net to get a copy of this message | ||
Commit: 6fc93dfa6cd9fd4b571d0890e4201422adb21a32
Author: Anatol Belski <ab@php.net> Wed, 21 Aug 2013 00:27:07 -0700
Parents: a61c753006d03db4cca2ec90b71b69a972ae1a5a
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6fc93dfa6cd9fd4b571d0890e4201422adb21a32
Log:
fixed str_split()
Changed paths:
M ext/standard/string.c
Diff:
diff --git a/ext/standard/string.c b/ext/standard/string.c
index ad83cb8..2fe9e84 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -5514,19 +5514,21 @@ PHP_FUNCTION(str_split)
RETURN_FALSE;
}
- array_init_size(return_value, ((str_len - 1) / split_length) + 1);
-
- if (split_length >= str_len) {
+ if (0 == str_len) {
+ array_init_size(return_value, 1);
add_next_index_stringl(return_value, str, str_len, 1);
return;
}
+ array_init_size(return_value, ((str_len - 1) / split_length) + 1);
+
n_reg_segments = str_len / split_length;
p = str;
- while (n_reg_segments-- > 0) {
+ while (n_reg_segments > 0) {
add_next_index_stringl(return_value, p, split_length, 1);
p += split_length;
+ n_reg_segments--;
}
if (p != (str + str_len)) {