summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-08-22 17:39:56 +0100
committerOlav Vitters <olav@vitters.nl>2013-08-22 22:10:00 +0200
commit74764199404e4b3b9a176e4ee716a16503e5691d (patch)
tree969b7e794c0917f7a5371828539627c4e4774247
parent25ad3486a4dde131c285212dc652f5a07bbf0d7c (diff)
downloadmutter-74764199404e4b3b9a176e4ee716a16503e5691d.tar.gz
MonitorXrandr: Fix segv when accessing possible_clones
This code requires a double pass and the segv happens later when trying to iterate over the array. https://bugzilla.gnome.org/show_bug.cgi?id=706598
-rw-r--r--src/core/monitor-xrandr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/monitor-xrandr.c b/src/core/monitor-xrandr.c
index 1a66c13ce..0a7dc0b38 100644
--- a/src/core/monitor-xrandr.c
+++ b/src/core/monitor-xrandr.c
@@ -532,7 +532,7 @@ meta_monitor_manager_xrandr_read_current (MetaMonitorManager *manager)
*/
for (j = 0; j < (unsigned)output->nclone; j++)
{
- meta_output->possible_clones = GINT_TO_POINTER (output->clones[j]);
+ meta_output->possible_clones[j] = GINT_TO_POINTER (output->clones[j]);
}
meta_output->is_primary = ((XID)meta_output->output_id == primary_output);