gtk+ r21541 - in branches/gtk-2-14: . gtk

[rhult svn gnome org]

Author: rhult
Date: Mon Sep 29 10:51:58 2008
New Revision: 21541
URL: http://svn.gnome.org/viewvc/gtk+?rev=21541&view=rev

Log:
2008-09-29  Richard Hult  <richard imendio com>

	Merged from trunk:

	Bug 554141 â uninitialized data use/free in gtkclipboard-quartz.c

	* gtk/gtkclipboard-quartz.c: (gtk_clipboard_wait_for_contents):
	Patch from Jon A. Cruz to initialize the allocated selection data.


Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/gtk/gtkclipboard-quartz.c

Modified: branches/gtk-2-14/gtk/gtkclipboard-quartz.c
==============================================================================
--- branches/gtk-2-14/gtk/gtkclipboard-quartz.c	(original)
+++ branches/gtk-2-14/gtk/gtkclipboard-quartz.c	Mon Sep 29 10:51:58 2008
@@ -890,7 +890,7 @@
 
       length = [types count] * sizeof (GdkAtom);
       
-      selection_data = g_slice_new (GtkSelectionData);
+      selection_data = g_slice_new0 (GtkSelectionData);
       selection_data->selection = clipboard->selection;
       selection_data->target = target;