Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory leak in win_res()

Browse Source 
Fixes issue #372.
This commit is contained in:
Bert Münnich
2020-01-16 11:13:41 +01:00
parent 55777ba9f4
commit d9e60cb4c0
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
window.c
View File

@@ -71,18 +71,14 @@ void win_alloc_color(const win_env_t *e, const char *name, XftColor *col)
} }
} }
const char* win_res(Display *dpy, const char *name, const char *def) const char* win_res(XrmDatabase db, const char *name, const char *def)
{ {
char *type; char *type;
XrmValue ret; XrmValue ret;
XrmDatabase db;
char *res_man;
XrmInitialize(); if (db != None &&
XrmGetResource(db, name, name, &type, &ret) &&
if ((res_man = XResourceManagerString(dpy)) != NULL && STREQ(type, "String"))
(db = XrmGetStringDatabase(res_man)) != NULL &&
XrmGetResource(db, name, name, &type, &ret) && STREQ(type, "String"))
{ {
return ret.addr; return ret.addr;
} else { } else {
@@ -97,6 +93,8 @@ void win_init(win_t *win)
{ {
win_env_t *e; win_env_t *e;
const char *bg, *fg, *f; const char *bg, *fg, *f;
char *res_man;
XrmDatabase db;
memset(win, 0, sizeof(win_t)); memset(win, 0, sizeof(win_t));
@@ -114,11 +112,15 @@ void win_init(win_t *win)
if (setlocale(LC_CTYPE, "") == NULL || XSupportsLocale() == 0) if (setlocale(LC_CTYPE, "") == NULL || XSupportsLocale() == 0)
error(0, 0, "No locale support"); error(0, 0, "No locale support");
f = win_res(e->dpy, RES_CLASS ".font", "monospace-8"); XrmInitialize();
res_man = XResourceManagerString(e->dpy);
db = res_man != NULL ? XrmGetStringDatabase(res_man) : None;
f = win_res(db, RES_CLASS ".font", "monospace-8");
win_init_font(e, f); win_init_font(e, f);
bg = win_res(e->dpy, RES_CLASS ".background", "white"); bg = win_res(db, RES_CLASS ".background", "white");
fg = win_res(e->dpy, RES_CLASS ".foreground", "black"); fg = win_res(db, RES_CLASS ".foreground", "black");
win_alloc_color(e, bg, &win->bg); win_alloc_color(e, bg, &win->bg);
win_alloc_color(e, fg, &win->fg); win_alloc_color(e, fg, &win->fg);