isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

monitor-manager-kms: Avoid a couple of potential crashes

Browse Source 
The drm API can return NULL and we could end up using uninitialized
memory if the driver private struct isn't cleared.
This commit is contained in:
Rui Matos 2015-04-28 16:52:20 +02:00
parent 9060190555
commit 7eca43cec9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backends/native/meta-monitor-manager-kms.c
View File

@ -224,6 +224,9 @@ find_crtc_properties (MetaMonitorManagerKms *manager_kms,
crtc_kms = meta_crtc->driver_private; crtc_kms = meta_crtc->driver_private;
props = drmModeObjectGetProperties (manager_kms->fd, meta_crtc->crtc_id, DRM_MODE_OBJECT_CRTC); props = drmModeObjectGetProperties (manager_kms->fd, meta_crtc->crtc_id, DRM_MODE_OBJECT_CRTC);
if (!props)
return;
for (i = 0; i < props->count_props; i++) for (i = 0; i < props->count_props; i++)
{ {
drmModePropertyPtr prop = drmModeGetProperty (manager_kms->fd, props->props[i]); drmModePropertyPtr prop = drmModeGetProperty (manager_kms->fd, props->props[i]);
@ -479,7 +482,7 @@ meta_monitor_manager_kms_read_current (MetaMonitorManager *manager)
height = MAX (height, meta_crtc->rect.y + meta_crtc->rect.height); height = MAX (height, meta_crtc->rect.y + meta_crtc->rect.height);
} }
meta_crtc->driver_private = g_new (MetaCRTCKms, 1); meta_crtc->driver_private = g_new0 (MetaCRTCKms, 1);
meta_crtc->driver_notify = (GDestroyNotify) meta_crtc_destroy_notify; meta_crtc->driver_notify = (GDestroyNotify) meta_crtc_destroy_notify;
find_crtc_properties (manager_kms, meta_crtc); find_crtc_properties (manager_kms, meta_crtc);