Backport virtual_realpath() from PHP5. This fixes a memory leak that would

occur inside every virtual_realpath() call.

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index fd27f70666d6c4277e22ee5bf76a24c1c6c158f4..f1edfe2e8510a52ba785895c80b2ded8a4f094eb 100644 (file)
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -486,19 +486,23 @@ CWD_API int virtual_chdir_file(const char *path, int (*p_chdir)(const char *path
 CWD_API char *virtual_realpath(const char *path, char *real_path TSRMLS_DC)
 {
        cwd_state new_state;
-       int retval;
+       char *retval;
 
        CWD_STATE_COPY(&new_state, &CWDG(cwd));
-       retval = virtual_file_ex(&new_state, path, NULL, 1);
        
-       if (!retval) {
+       if (virtual_file_ex(&new_state, path, NULL, 1)==0) {
                int len = new_state.cwd_length>MAXPATHLEN-1?MAXPATHLEN-1:new_state.cwd_length;
+
                memcpy(real_path, new_state.cwd, len);
                real_path[len] = '\0';
-               return real_path;
+               retval = real_path;
+       } else {
+               retval = NULL;
        }
 
-       return NULL;
+       CWD_STATE_FREE(&new_state);
+
+       return retval;
 }
 
 CWD_API int virtual_filepath_ex(const char *path, char **filepath, verify_path_func verify_path TSRMLS_DC)