Under win32 we freed the wrong pointer causing a segmentation fault.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@455 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2006-01-12 17:12:44 +00:00
parent cb2a7ed028
commit 262c60fcaa

View file

@ -965,19 +965,19 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
FILE *f; FILE *f;
char *lfn; char *lfn;
lfn = pa_sprintf_malloc("%s/%s", h, local); fn = lfn = pa_sprintf_malloc("%s/%s", h, local);
#ifdef OS_IS_WIN32 #ifdef OS_IS_WIN32
if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX)) if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX))
return NULL; return NULL;
lfn = buf; fn = buf;
#endif #endif
f = fopen(lfn, "r"); f = fopen(fn, "r");
if (f || errno != ENOENT) { if (f || errno != ENOENT) {
if (result) if (result)
*result = pa_xstrdup(lfn); *result = pa_xstrdup(fn);
pa_xfree(lfn); pa_xfree(lfn);
return f; return f;
} }