archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Allocate enough memory for additional /.

Browse source 
Also remove the extra check for the trailing /. Unix will automatically
apply s#/+#/#

Partly suggested by: drew@elysium.ltd.uk
PR: #3956
This commit is contained in:
Sascha Schumann 2000-03-30 12:55:59 +00:00
parent 0ccbd9d9ec
commit fe92fef608
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/standard/dl.c
View file

@ -88,13 +88,9 @@ void php_dl(pval *file,int type,pval *return_value)
&& PG(extension_dir)[0]){ && PG(extension_dir)[0]){
int extension_dir_len = strlen(PG(extension_dir)); int extension_dir_len = strlen(PG(extension_dir));
libpath = emalloc(extension_dir_len+file->value.str.len+1); libpath = emalloc(extension_dir_len+file->value.str.len+2);
if (PG(extension_dir)[extension_dir_len-1]=='/' || PG(extension_dir)[extension_dir_len-1]=='\\') { sprintf(libpath,"%s/%s",PG(extension_dir),file->value.str.val);
sprintf(libpath,"%s%s",PG(extension_dir),file->value.str.val);
} else {
sprintf(libpath,"%s/%s",PG(extension_dir),file->value.str.val);
}
} else { } else {
libpath = estrndup(file->value.str.val, file->value.str.len); libpath = estrndup(file->value.str.val, file->value.str.len);
} }