diff options
| author | Martin Whitaker <foss@martin-whitaker.me.uk> | 2020-07-23 16:01:16 +0100 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2020-07-24 11:24:08 +0000 |
| commit | 7b79fcee45cb43dfb9eedfd49ee8deccd9176c3d (patch) | |
| tree | 39f97e402459f630e31fa63dba5b55be28f1a8fd /src/backends/meta-monitor-manager-dummy.c | |
| parent | ac6990ef51bed4bf195ade2d257280a1b4f525ed (diff) | |
| download | mutter-7b79fcee45cb43dfb9eedfd49ee8deccd9176c3d.tar.gz | |
Fix segfaults on 32-bit systems.
The new "id" properties for the MetaCrtc* and MetaOuput* objects are 64-bit
values, so take care to pass 64-bit values when calling g_object_new.
Fixes https://gitlab.gnome.org/GNOME/mutter/-/issues/1343.
Diffstat (limited to 'src/backends/meta-monitor-manager-dummy.c')
| -rw-r--r-- | src/backends/meta-monitor-manager-dummy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backends/meta-monitor-manager-dummy.c b/src/backends/meta-monitor-manager-dummy.c index ca3d200a7..2516d51ae 100644 --- a/src/backends/meta-monitor-manager-dummy.c +++ b/src/backends/meta-monitor-manager-dummy.c @@ -96,7 +96,7 @@ create_mode (CrtcModeSpec *spec, crtc_mode_info->refresh_rate = spec->refresh_rate; return g_object_new (META_TYPE_CRTC_MODE, - "id", mode_id, + "id", (uint64_t) mode_id, "info", crtc_mode_info, NULL); } @@ -205,7 +205,7 @@ append_monitor (MetaMonitorManager *manager, *modes = g_list_concat (*modes, new_modes); crtc = g_object_new (META_TYPE_CRTC_DUMMY, - "id", g_list_length (*crtcs) + 1, + "id", (uint64_t) g_list_length (*crtcs) + 1, "gpu", gpu, NULL); *crtcs = g_list_append (*crtcs, crtc); @@ -237,7 +237,7 @@ append_monitor (MetaMonitorManager *manager, output_info->n_possible_crtcs = 1; output = g_object_new (META_TYPE_OUTPUT_DUMMY, - "id", number, + "id", (uint64_t) number, "gpu", gpu, "info", output_info, NULL); @@ -291,7 +291,7 @@ append_tiled_monitor (MetaMonitorManager *manager, MetaCrtc *crtc; crtc = g_object_new (META_TYPE_CRTC_DUMMY, - "id", g_list_length (*crtcs) + i + 1, + "id", (uint64_t) g_list_length (*crtcs) + i + 1, "gpu", gpu, NULL); new_crtcs = g_list_append (new_crtcs, crtc); @@ -358,7 +358,7 @@ append_tiled_monitor (MetaMonitorManager *manager, output_info->n_possible_crtcs = n_tiles; output = g_object_new (META_TYPE_OUTPUT_DUMMY, - "id", number, + "id", (uint64_t) number, "gpu", gpu, "info", output_info, NULL); |