php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 22:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix for bug #14832: basename with 2nd parm corrupts source string

Browse Source
This commit is contained in:
Hartmut Holzgraefe
2002-01-03 20:20:35 +00:00
parent 7603d13733
commit c9bc54abc3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ext/standard/string.c
View File

@@ -1073,14 +1073,16 @@ 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';
char *ret=NULL, *c, *p=NULL, buf='\0', *p2=NULL, buf2='\0';
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 + 1) = '\0';
buf2 = *(c + 1); /* Save overwritten char */
*(c + 1) = '\0'; /* overwrite char */
p2 = c + 1; /* Save pointer to overwritten char */
}
}
@@ -1108,6 +1110,7 @@ PHPAPI char *php_basename(char *s, size_t len, char *suffix, size_t sufflen)
ret = estrdup(s);
}
if(buf) *p = buf;
if(buf2) *p2 = buf2;
return (ret);
}
/* }}} */