- Fix memory leak.

Andi Gutmans · Andi Gutmans · commit e91c188e8534 · 2000-10-12T19:58:20.000Z
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
@@ -975,6 +975,7 @@ PHPAPI char *expand_filepath(const char *filepath, char *real_path)
 	new_state.cwd_length = strlen(cwd);
 
 	if(virtual_file_ex(&new_state, filepath, NULL)) {
+		free(new_state.cwd);
 		return NULL;
 	}
 
@@ -984,8 +985,8 @@ PHPAPI char *expand_filepath(const char *filepath, char *real_path)
 		real_path[copy_len]='\0';
 	} else {
 		real_path = estrndup(new_state.cwd, new_state.cwd_length);
-		free(new_state.cwd);
 	}
+	free(new_state.cwd);
 
 	return real_path;
 }

Original file line number	Diff line number	Diff line change
`@@ -975,6 +975,7 @@ PHPAPI char expand_filepath(const char filepath, char *real_path)`
`975`	`975`	`new_state.cwd_length = strlen(cwd);`
`976`	`976`
`977`	`977`	`if(virtual_file_ex(&new_state, filepath, NULL)) {`
	`978`	`+ free(new_state.cwd);`
`978`	`979`	`return NULL;`
`979`	`980`	`}`
`980`	`981`
`@@ -984,8 +985,8 @@ PHPAPI char expand_filepath(const char filepath, char *real_path)`
`984`	`985`	`real_path[copy_len]='\0';`
`985`	`986`	`} else {`
`986`	`987`	`real_path = estrndup(new_state.cwd, new_state.cwd_length);`
`987`		`- free(new_state.cwd);`
`988`	`988`	`}`
	`989`	`+ free(new_state.cwd);`
`989`	`990`
`990`	`991`	`return real_path;`
`991`	`992`	`}`