X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=obt%2Fpaths.c;h=d2e230dffd028e39cf144b6811c559536eda2e0c;hb=b025a0268f302df78589d3cc36aad5f56693799f;hp=e2e4859b8d94385053c1f50bcf46a172bdc71b5e;hpb=262591ec1adc1badfcb36e9e6876dd81f2df9492;p=chaz%2Fopenbox diff --git a/obt/paths.c b/obt/paths.c index e2e4859b..d2e230df 100644 --- a/obt/paths.c +++ b/obt/paths.c @@ -126,7 +126,7 @@ static void find_uid_gid(uid_t *u, gid_t **g, guint *n) } endgrent(); - qsort(*g, sizeof(gid_t), *n, gid_cmp); + qsort(*g, *n, sizeof(gid_t), gid_cmp); } ObtPaths* obt_paths_new(void) @@ -231,9 +231,13 @@ void obt_paths_unref(ObtPaths *p) for (it = p->autostart_dirs; it; it = g_slist_next(it)) g_free(it->data); g_slist_free(p->autostart_dirs); + for (it = p->exec_dirs; it; it = g_slist_next(it)) + g_free(it->data); + g_slist_free(p->exec_dirs); g_free(p->config_home); g_free(p->data_home); g_free(p->cache_home); + g_free(p->gid); g_slice_free(ObtPaths, p); } @@ -331,7 +335,8 @@ static inline gboolean try_exec(const ObtPaths *const p, struct stat st; BSEARCH_SETUP(guint); - stat(path, &st); + if (stat(path, &st) != 0) + return FALSE; if (!S_ISREG(st.st_mode)) return FALSE;