Attachment 936343 Details for Bug 1140414 – avoid null dereferences

avoid null dereferences

gtk+-2.24.24-avoid_null_dereference.patch (text/plain), 2.14 KB, created by Sami Farin on 2014-09-10 23:03:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sami Farin

Created: 2014-09-10 23:03:24 UTC

Size: 2.14 KB

patch

obsolete

>--- gtk+-2.24.24/gtk/gtklabel.c.bak	2014-03-06 06:56:42.000000000 +0200
>+++ gtk+-2.24.24/gtk/gtklabel.c	2014-09-11 01:31:59.101855435 +0300
>@@ -1295,11 +1295,11 @@ pango_start_element (GMarkupParseContext
> 	}
> 
>       attr = attribute_from_text (data->builder, name, value, error);
>-      attr->start_index = start_val;
>-      attr->end_index   = end_val;
>-
>       if (attr)
> 	{
>+	  attr->start_index = start_val;
>+	  attr->end_index   = end_val;
>+
> 	  if (!data->attrs)
> 	    data->attrs = pango_attr_list_new ();
> 
>--- gtk+-2.24.24/modules/other/gail/gailbutton.c.bak	2014-03-06 06:56:42.000000000 +0200
>+++ gtk+-2.24.24/modules/other/gail/gailbutton.c	2014-09-11 01:44:33.737694085 +0300
>@@ -488,37 +488,39 @@ static gboolean
> idle_do_action (gpointer data)
> {
>   GtkButton *button; 
>   GtkWidget *widget;
>   GailButton *gail_button;
>   GdkEvent tmp_event;
> 
>   gail_button = GAIL_BUTTON (data);
>   gail_button->action_idle_handler = 0;
>   widget = GTK_ACCESSIBLE (gail_button)->widget;
>-  tmp_event.button.type = GDK_BUTTON_RELEASE;
>-  tmp_event.button.window = widget->window;
>-  tmp_event.button.button = 1;
>-  tmp_event.button.send_event = TRUE;
>-  tmp_event.button.time = GDK_CURRENT_TIME;
>-  tmp_event.button.axes = NULL;
> 
>   g_object_ref (gail_button);
> 
>   if (widget == NULL /* State is defunct */ ||
>       !gtk_widget_is_sensitive (widget) || !gtk_widget_get_visible (widget))
>     {
>       g_object_unref (gail_button);
>       return FALSE;
>     }
>   else
>-    gtk_widget_event (widget, &tmp_event);
>+    {
>+      tmp_event.button.type = GDK_BUTTON_RELEASE;
>+      tmp_event.button.window = widget->window;
>+      tmp_event.button.button = 1;
>+      tmp_event.button.send_event = TRUE;
>+      tmp_event.button.time = GDK_CURRENT_TIME;
>+      tmp_event.button.axes = NULL;
>+      gtk_widget_event (widget, &tmp_event);
>+    }
> 
>   button = GTK_BUTTON (widget); 
>   while (!g_queue_is_empty (gail_button->action_queue)) 
>     {
>       gint action_number = GPOINTER_TO_INT(g_queue_pop_head (gail_button->action_queue));
>       if (gail_button->default_is_press)
>         {
>           if (action_number == 0)
>             action_number = 1;
>           else if (action_number == 1)

Actions: View

Attachments on bug 1140414: 936343