瀏覽代碼

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.
master
Aaron Marcher 7 年之前
父節點
當前提交
6f01174392
沒有發現已知的金鑰在資料庫的簽署中 GPG 金鑰 ID: 74B048E5C2474F9A
共有 1 個檔案被更改,包括 5 行新增2 行删除
  1. +5
    -2
      slstatus.c

+ 5
- 2
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, "");


Loading…
取消
儲存