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

Bugfix: validation segfault 

When `new_window` is given in the config, config validation with `i3 -C`
would segfault.

Add a NULL check in logical_px() to check for the case when the config
is being validated without an X server to prevent this.
This commit is contained in:
Tony Crisci 2015-03-22 05:46:52 -04:00
parent 2190bb9386
commit 6fb7fc9bc6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libi3/dpi.c
View File

@ -17,6 +17,12 @@ extern xcb_screen_t *root_screen;
* *
*/ */
int logical_px(const int logical) { int logical_px(const int logical) {
if (root_screen == NULL) {
/* Dpi info may not be available when parsing a config without an X
* server, such as for config file validation. */
return logical;
}
const int dpi = (double)root_screen->height_in_pixels * 25.4 / const int dpi = (double)root_screen->height_in_pixels * 25.4 /
(double)root_screen->height_in_millimeters; (double)root_screen->height_in_millimeters;
/* There are many misconfigurations out there, i.e. systems with screens /* There are many misconfigurations out there, i.e. systems with screens