mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix a few potential bad memory accesses

Browse source
This commit is contained in:
Lennart Poettering 2008-08-06 03:04:22 +02:00
parent 34dd4a20f2
commit 9fde00e449
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/pulsecore/core-util.c
View file

@ -1185,7 +1185,7 @@ static char *get_dir(mode_t m, const char *env_name) {
} }
if (st.st_uid != getuid()) { if (st.st_uid != getuid()) {
pa_log_error("Home directory %s not ours.", d); pa_log_error("Home directory %s not ours.", h);
return NULL; return NULL;
} }
@ -1253,6 +1253,8 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", e, local); fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", e, local);
else if (pa_get_home_dir(h, sizeof(h))) else if (pa_get_home_dir(h, sizeof(h)))
fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP ".pulse" PA_PATH_SEP "%s", h, local); fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP ".pulse" PA_PATH_SEP "%s", h, local);
else
return NULL;
#ifdef OS_IS_WIN32 #ifdef OS_IS_WIN32
if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX)) { if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX)) {
@ -1311,6 +1313,7 @@ char *pa_find_config_file(const char *global, const char *local, const char *env
#endif #endif
if (env && (fn = getenv(env))) { if (env && (fn = getenv(env))) {
#ifdef OS_IS_WIN32 #ifdef OS_IS_WIN32
if (!ExpandEnvironmentStrings(fn, buf, PATH_MAX)) if (!ExpandEnvironmentStrings(fn, buf, PATH_MAX))
return NULL; return NULL;
@ -1333,6 +1336,8 @@ char *pa_find_config_file(const char *global, const char *local, const char *env
fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", e, local); fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", e, local);
else if (pa_get_home_dir(h, sizeof(h))) else if (pa_get_home_dir(h, sizeof(h)))
fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP ".pulse" PA_PATH_SEP "%s", h, local); fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP ".pulse" PA_PATH_SEP "%s", h, local);
else
return NULL;
#ifdef OS_IS_WIN32 #ifdef OS_IS_WIN32
if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX)) { if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX)) {
@ -1364,7 +1369,7 @@ char *pa_find_config_file(const char *global, const char *local, const char *env
global = buf; global = buf;
#endif #endif
if (access(fn, R_OK) == 0) if (access(global, R_OK) == 0)
return pa_xstrdup(global); return pa_xstrdup(global);
} else } else
errno = ENOENT; errno = ENOENT;