Allocate enough memory for additional /.

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

Partly suggested by: drew@elysium.ltd.uk
PR: #3956

diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index 08041e548c325aae74c14149d31fa435215ddf4f..a06c7bb77d6d475a3caab2fb116907e76ca6c454 100644 (file)
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -88,13 +88,9 @@ void php_dl(pval *file,int type,pval *return_value)
                && PG(extension_dir)[0]){
                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);
-               } else {
-                       sprintf(libpath,"%s/%s",PG(extension_dir),file->value.str.val);
-               }
+               sprintf(libpath,"%s/%s",PG(extension_dir),file->value.str.val);
        } else {
                libpath = estrndup(file->value.str.val, file->value.str.len);
        }