[Spice-devel] [spice-gtk 3/3] gtk/display: be more paranoid about potentially NULL pointer

Christophe Fergeau cfergeau at gmail.com
Tue Mar 22 07:48:00 PDT 2011


If things don't go as expected in gnome_rr_config_ensure_primary
(for example we don't find any usable output), we may end up
trying to dereference a NULL pointer. It's better to check
top_left is not NULL before using it.
---
 gtk/display/gnome-rr-config.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gtk/display/gnome-rr-config.c b/gtk/display/gnome-rr-config.c
index 5e22596..bb5cafc 100644
--- a/gtk/display/gnome-rr-config.c
+++ b/gtk/display/gnome-rr-config.c
@@ -1230,7 +1230,7 @@ gnome_rr_config_ensure_primary (GnomeRRConfig *configuration)
         if (!found) {
                 if (laptop != NULL) {
                         laptop->priv->primary = TRUE;
-                } else {
+                } else if (top_left != NULL) {
                         top_left->priv->primary = TRUE;
                 }
         }
-- 
1.7.4



More information about the Spice-devel mailing list