slstatus

My fork of https://tools.suckless.org/slstatus/
git clone https://git.inz.fi/slstatus
Log | Files | Refs | README | LICENSE

commit 6f011743921db04e5513df45c5ac4b2c752d52de
parent 1814061396ef5855e2d1815665fc32e0902ccbe9
Author: Aaron Marcher <me@drkhsh.at>
Date:   Fri, 11 Aug 2017 14:33:02 +0200

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.

Diffstat:
Mslstatus.c | 7+++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/slstatus.c b/slstatus.c @@ -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, "");