procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid possible NULL pointer dereference found by GCC 6.1.1

Browse source 
* src/xfns.c (x_get_monitor_attributes_xrandr): Always check
the value returned by XRRGetOutputInfo.
This commit is contained in:
Dmitry Antipov 2016-06-29 07:46:59 +03:00
parent 1a5d0c1518
commit 4a2a1eba09
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/xfns.c
View file

@ -4295,8 +4295,8 @@ x_get_monitor_attributes_xrandr (struct x_display_info *dpyinfo)
{
XRROutputInfo *info = XRRGetOutputInfo (dpy, resources,
resources->outputs[i]);
Connection conn = info ? info->connection : RR_Disconnected;
RRCrtc id = info ? info->crtc : None;
if (!info)
continue;
if (strcmp (info->name, "default") == 0)
{
@ -4307,9 +4307,9 @@ x_get_monitor_attributes_xrandr (struct x_display_info *dpyinfo)
return Qnil;
}
if (conn != RR_Disconnected && id != None)
if (info->connection != RR_Disconnected && info->crtc != None)
{
XRRCrtcInfo *crtc = XRRGetCrtcInfo (dpy, resources, id);
XRRCrtcInfo *crtc = XRRGetCrtcInfo (dpy, resources, info->crtc);
struct MonitorInfo *mi = &monitors[i];
XRectangle workarea_r;