From: Hartmut Holzgraefe <hholzgra@php.net>
Date: Thu, 1 Jun 2000 11:47:48 +0000 (+0000)
Subject: uh, off by one?!! this time it's regression-tested, fast and compact
X-Git-Tag: PRE_EIGHT_BYTE_ALLOC_PATCH~158
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a35237795fd44e9c2a6fcbec5661bafabf434d52;p=php

uh, off by one?!! this time it's regression-tested, fast and compact
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 743c0b80eb..62c95f1689 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1138,8 +1138,7 @@ PHP_FUNCTION(ucfirst)
 PHP_FUNCTION(ucwords)
 {
 	zval **str;
-	char *r;
-	int i, new_word = 1;
+	register char *r,*r_end;
 	
 	if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &str) == FAILURE) {
 		WRONG_PARAM_COUNT;
@@ -1151,18 +1150,12 @@ PHP_FUNCTION(ucwords)
 	}
 	*return_value=**str;
 	zval_copy_ctor(return_value);
-	r=return_value->value.str.val;
 
-	for (i = 0; i < (*str)->value.str.len; i++, r++) {
-		/* Alpha char preceeded by white space? Uppercase it. */
-		if (new_word && isalpha(*r)) {
-			*r = toupper((unsigned char)*r);
-		}
-		/* Find a word boundary. */
-		if (isspace(*r)) {
-			new_word = 1;
-		} else {
-			new_word = 0;
+	r=return_value->value.str.val;
+	*r=toupper((unsigned char)*r);
+	for(r_end = r + return_value->value.str.len -1 ; r < r_end ; r++ ) {
+		if(isspace(*r)) {
+			*++r=toupper((unsigned char)*r);
 		}
 	}
 }