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.

diff --git a/slstatus.c b/slstatus.c
index 596d6a6..47bd4c9 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -380,10 +380,9 @@ kernel_release(void)
 static const char *
 keyboard_indicators(void)
 {
 static const char *
 keyboard_indicators(void)
 {

-       Display *dpy = XOpenDisplay(NULL);

        XKeyboardState state;
        XKeyboardState state;

+

        XGetKeyboardControl(dpy, &state);
        XGetKeyboardControl(dpy, &state);

-       XCloseDisplay(dpy);

 
        switch (state.led_mask) {
                case 1:
 
        switch (state.led_mask) {
                case 1:


@@ -879,6 +878,10 @@ main(int argc, char *argv[])
 
        if (!sflag) {
                dpy = XOpenDisplay(NULL);
 
        if (!sflag) {
                dpy = XOpenDisplay(NULL);

+               if (!dpy) {
+                       fprintf(stderr, "slstatus: cannot open display");
+                       exit(1);
+               }

        }
 
        setlocale(LC_ALL, "");
        }
 
        setlocale(LC_ALL, "");