nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid use of uninitialized in init_dpi_end 

If conn == NULL or display == NULL, init_dpi() jumps to init_dpi_end
before (declaring and) initializing resource. In init_dpi_end, there
is a free(resource) call conditionally on resource != NULL, so this
may lead to a bogus free. Found by clang -Wsometimes-uninitialized.
This commit is contained in:
Theo Buehler 2017-08-23 15:48:58 +02:00 committed by Michael Stapelberg
parent e1f6a3e3d3
commit e8dbf0171d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libi3/dpi.c
View File

@ -24,6 +24,7 @@ static long init_dpi_fallback(void) {
*/ */
void init_dpi(void) { void init_dpi(void) {
xcb_xrm_database_t *database = NULL; xcb_xrm_database_t *database = NULL;
char *resource = NULL;
if (conn == NULL) { if (conn == NULL) {
goto init_dpi_end; goto init_dpi_end;
@ -35,7 +36,6 @@ void init_dpi(void) {
goto init_dpi_end; goto init_dpi_end;
} }
char *resource;
xcb_xrm_resource_get_string(database, "Xft.dpi", NULL, &resource); xcb_xrm_resource_get_string(database, "Xft.dpi", NULL, &resource);
if (resource == NULL) { if (resource == NULL) {
DLOG("Resource Xft.dpi not specified, skipping.\n"); DLOG("Resource Xft.dpi not specified, skipping.\n");