Attachment 303766 Details for Bug 444079 – A better NULL checking patch

[patch] A better NULL checking patch

fix-xgl.patch (text/plain), 1.48 KB, created by James Westby on 2008-04-25 09:54:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Westby

Created: 2008-04-25 09:54:50 UTC

Size: 1.48 KB

patch

obsolete

>--- gnome-desktop-2.22.1-patched/libgnome-desktop/randrwrap.c	2008-04-08 22:36:57.000000000 -0700
>+++ gnome-desktop-2.22.1-working/libgnome-desktop/randrwrap.c	2008-04-08 23:15:31.000000000 -0700
>@@ -200,6 +210,8 @@ fill_out_screen_info (Display *xdisplay,
> {
>     XRRScreenResources *resources;
> 
>+    g_return_val_if_fail (info != NULL, FALSE);
>+
>     gdk_error_trap_push ();
> 
>     if (!XRRGetScreenSizeRange (xdisplay, xroot,
>@@ -305,6 +317,9 @@ screen_info_new (RWScreen *screen)
>     ScreenInfo *info = g_new0 (ScreenInfo, 1);
>     RWOutput **o;
> 
>+    g_return_val_if_fail (info != NULL, NULL);
>+    g_return_val_if_fail (screen != NULL, NULL);
>+
>     info->outputs = NULL;
>     info->crtcs = NULL;
>     info->modes = NULL;
>@@ -220,7 +220,7 @@
>                                 &(info->max_width),
>                                 &(info->max_height))) {
>         /* XRR caught an error */
>-        g_print("Error:  X was unable to determine screen size range for window %d\n", xroot);
>         return False;
>     }
> 
>@@ -228,7 +228,7 @@
>     if (gdk_error_trap_pop ())
>     {
>         /* Unhandled X Error was generated */
>-        g_print("Error:  X Error received when attempting to get screen size range for window %d\n", xroot);
>         return False;
>     }
> 
>@@ -424,7 +424,10 @@
> 	screen->randr_event_base = event_base;
> 
> 	screen->info = screen_info_new (screen);
>-	
>+
>+	if (!(screen->info))
>+		return NULL;
>+
> 	XRRSelectInput (screen->xdisplay,
> 			screen->xroot,
> 			RRScreenChangeNotifyMask	|

Actions: View | Diff

Attachments on bug 444079: 303693 | 303766