Fixed possible NULL-deref and removed unnecessary XOpenDisplay()
- Added a check for the return value of XOpenDisplay() in main(). This fixes a possible NULL-deref. - Removed unnsecessary XOpenDisplay and XCloseDisplay from keyboard_indicators(). The ones in main() are sufficent.
This commit is contained in:
parent
1814061396
commit
6f01174392
@ -380,10 +380,9 @@ kernel_release(void)
|
||||
static const char *
|
||||
keyboard_indicators(void)
|
||||
{
|
||||
Display *dpy = XOpenDisplay(NULL);
|
||||
XKeyboardState state;
|
||||
|
||||
XGetKeyboardControl(dpy, &state);
|
||||
XCloseDisplay(dpy);
|
||||
|
||||
switch (state.led_mask) {
|
||||
case 1:
|
||||
@ -879,6 +878,10 @@ main(int argc, char *argv[])
|
||||
|
||||
if (!sflag) {
|
||||
dpy = XOpenDisplay(NULL);
|
||||
if (!dpy) {
|
||||
fprintf(stderr, "slstatus: cannot open display");
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
setlocale(LC_ALL, "");
|
||||
|
Loading…
Reference in New Issue
Block a user