Index: ext/standard/string.c
===================================================================
RCS file: /repository/php-src/ext/standard/string.c,v
retrieving revision 1.333.2.52.2.4
diff -u -p -d -r1.333.2.52.2.4 string.c
--- ext/standard/string.c	13 Mar 2006 14:41:27 -0000	1.333.2.52.2.4
+++ ext/standard/string.c	19 May 2006 10:17:27 -0000
@@ -1063,12 +1063,14 @@ PHP_FUNCTION(strtolower)
 PHPAPI char *php_basename(char *s, size_t len, char *suffix, size_t sufflen)
 {
 	char *ret=NULL, *c, *p=NULL, buf='\0', *p2=NULL, buf2='\0';
+	int cnt = len;
 	c = s + len - 1;	
 
 	/* do suffix removal as the unix command does */
 	if (suffix && (len > sufflen)) {
 		if (!strncmp(suffix, c-sufflen+1, sufflen)) {
-			c -= sufflen; 
+			c -= sufflen;
+			cnt -= sufflen;
 			buf2 = *(c + 1); /* Save overwritten char */
 			*(c + 1) = '\0'; /* overwrite char */
 			p2 = c + 1;      /* Save pointer to overwritten char */
@@ -1077,12 +1079,15 @@ PHPAPI char *php_basename(char *s, size_
 
 
 	/* strip trailing slashes */
-	while (*c == '/'
+	while (cnt > 0 && (*c == '/'
 #ifdef PHP_WIN32
 		   || (*c == '\\' && !IsDBCSLeadByte(*(c-1)))
 #endif
-		)
+		   )) {
 		c--;
+		cnt--;
+	}
+
 	if (c+1 >= s && c < s+len-1) {
 		buf = *(c + 1);  /* Save overwritten char */
 		*(c + 1) = '\0'; /* overwrite char */