[cairo-commit] gtkcairo/gtkcairo gtkcairo.c,1.7,1.8

[OEyvind Kolaas]

Committed by: pippin

Update of /cvs/cairo/gtkcairo/gtkcairo
In directory pdx:/tmp/cvs-serv14593/gtkcairo

Modified Files:
	gtkcairo.c 
Log Message:
Fix double free during destruction of GtkCairo instance


Index: gtkcairo.c
===================================================================
RCS file: /cvs/cairo/gtkcairo/gtkcairo/gtkcairo.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** a/gtkcairo.c	21 Feb 2004 14:29:37 -0000	1.7
--- b/gtkcairo.c	22 Feb 2004 23:47:30 -0000	1.8
***************
*** 150,154 ****
  	gtkcairo = GTK_CAIRO (object);
  
! 	cairo_destroy (gtkcairo->cairo);
  
  	if (GTK_OBJECT_CLASS (parent_class)->destroy)
--- 150,157 ----
  	gtkcairo = GTK_CAIRO (object);
  
! 	if (gtkcairo->cairo) {
! 		cairo_destroy (gtkcairo->cairo);
! 		gtkcairo->cairo = NULL;
! 	}
  
  	if (GTK_OBJECT_CLASS (parent_class)->destroy)