iliaa Tue Nov 29 11:14:48 2005 EDT
Modified files:
/php-src/ext/standard string.c
/php-src/ext/standard/tests/strings str_word_count.phpt
Log:
MFB51: Fixed bug #35427 (str_word_count() handles '-' incorrectly).
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.506&r2=1.507&ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.506 php-src/ext/standard/string.c:1.507
--- php-src/ext/standard/string.c:1.506 Sat Nov 12 09:56:35 2005
+++ php-src/ext/standard/string.c Tue Nov 29 11:14:47 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.506 2005/11/12 14:56:35 derick Exp $ */
+/* $Id: string.c,v 1.507 2005/11/29 16:14:47 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -6531,33 +6531,38 @@
if (type == 1 || type == 2) {
array_init(return_value);
}
-
+
+ /* first character cannot be ' or -, unless explicitly allowed by the
user */
+ if ((*p == '\'' && (!char_list || !ch['\''])) || (*p == '-' &&
(!char_list || !ch['-']))) {
+ p++;
+ }
+ /* last character cannot be -, unless explicitly allowed by the user */
+ if (*(e - 1) == '-' && (!char_list || !ch['-'])) {
+ e--;
+ }
+
while (p < e) {
- if (isalpha(*p) || (char_list && ch[(unsigned char)*p])) {
- s = ++p - 1;
- while (isalpha(*p) || *p == '\'' || (*p == '-' &&
isalpha(*(p+1))) || (char_list && ch[(unsigned char)*p])) {
- p++;
- }
-
+ s = p;
+ while (p < e && (isalpha(*p) || (char_list && ch[(unsigned
char)*p]) || *p == '\'' || *p == '-')) {
+ p++;
+ }
+ if (p > s) {
switch (type)
{
case 1:
buf = estrndup(s, (p-s));
- add_next_index_stringl(return_value,
buf, (p-s), 1);
- efree(buf);
+ add_next_index_stringl(return_value,
buf, (p-s), 0);
break;
case 2:
buf = estrndup(s, (p-s));
- add_index_stringl(return_value, (s -
str), buf, p-s, 1);
- efree(buf);
+ add_index_stringl(return_value, (s -
str), buf, p-s, 0);
break;
default:
word_count++;
break;
}
- } else {
- p++;
}
+ p++;
}
if (!type) {
http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/str_word_count.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/standard/tests/strings/str_word_count.phpt
diff -u php-src/ext/standard/tests/strings/str_word_count.phpt:1.5
php-src/ext/standard/tests/strings/str_word_count.phpt:1.6
--- php-src/ext/standard/tests/strings/str_word_count.phpt:1.5 Thu Aug 18
02:32:39 2005
+++ php-src/ext/standard/tests/strings/str_word_count.phpt Tue Nov 29
11:14:47 2005
@@ -36,7 +36,11 @@
var_dump(str_word_count($str2, 2, array()));
var_dump(str_word_count($str2, 2, new stdClass));
var_dump(str_word_count($str2, 2, ""));
-
+var_dump(str_word_count("foo'0 bar-0var", 2, "0"));
+var_dump(str_word_count("'foo'", 2));
+var_dump(str_word_count("'foo'", 2, "'"));
+var_dump(str_word_count("-foo-", 2));
+var_dump(str_word_count("-foo-", 2, "-"));
?>
--EXPECTF--
array(6) {
@@ -225,4 +229,26 @@
string(3) "bar"
[15]=>
string(3) "foo"
-}
\ No newline at end of file
+}
+array(2) {
+ [0]=>
+ string(5) "foo'0"
+ [6]=>
+ string(8) "bar-0var"
+}
+array(1) {
+ [1]=>
+ string(4) "foo'"
+}
+array(1) {
+ [0]=>
+ string(5) "'foo'"
+}
+array(1) {
+ [1]=>
+ string(3) "foo"
+}
+array(1) {
+ [0]=>
+ string(5) "-foo-"
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
