[Xfce4-commits] [xfce/xfce4-settings] 01/01: Fix: Segfault in convert_xfce_output_info when plugging in an external model, fallback on 640x480 (Xfce #12580, RH #1317382)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

bluesabre pushed a commit to branch master
in repository xfce/xfce4-settings.

commit cd1ef4dc2a5323f130c31754a631caa228c9fd3b
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sat Aug 13 09:19:50 2016 -0400

    Fix: Segfault in convert_xfce_output_info when plugging in an external model, fallback on 640x480 (Xfce #12580, RH #1317382)
---
 dialogs/display-settings/main.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index e08b1de..199e291 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1608,8 +1608,16 @@ static XfceOutputInfo *convert_xfce_output_info (gint output_id)
     output->display_name = xfce_randr->friendly_name[output_id];
     output->connected = TRUE;
     output->on = xfce_randr->mode[output_id] != None;
-    output->pref_width = preferred->width;
-    output->pref_height = preferred->height;
+
+    if (preferred != NULL) {
+        output->pref_width = preferred->width;
+        output->pref_height = preferred->height;
+    } else {
+        // Fallback on 640x480 if randr detection fails (Xfce #12580)
+        output->pref_width = 640;
+        output->pref_height = 480;
+    }
+
     if (output->on)
     {
         output->rotation = xfce_randr->rotation[output_id];

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.