[Xfce4-commits] CVS: xfce4/xfdesktop/modules/menu desktop-menu.c, 1.11, 1.12

[Brian J. Tarricone]

please don't make any changes to xfdesktop code (menueditor excluded) 
without letting me know.  i currently have two local trees that i'm 
messing with to solve the app-crashing problem, and i don't want to have 
to resync my clean tree due to outside changes.

plus, what you added can cause a free() on a NULL pointer ^_~.

    -brian


Jasper Huysmans wrote:

>Update of /var/cvs/xfce/xfce4/xfdesktop/modules/menu
>In directory dbguin.lunar-linux.org:/tmp/cvs-serv4526
>
>Modified Files:
>	desktop-menu.c 
>Log Message:
>Extra NULL check
>
>Index: desktop-menu.c
>===================================================================
>RCS file: /var/cvs/xfce/xfce4/xfdesktop/modules/menu/desktop-menu.c,v
>retrieving revision 1.11
>retrieving revision 1.12
>diff -u -d -r1.11 -r1.12
>--- desktop-menu.c	12 May 2004 23:06:31 -0000	1.11
>+++ desktop-menu.c	17 May 2004 08:03:51 -0000	1.12
>@@ -1,6 +1,6 @@
> /*  xfce4
>  *  
>- *  Copyright (C) 2002-2003 Jasper Huijsmans (huysmans at users.sourceforge.net)
>+ *  Copyright (C) 2002-2003 Jasper Huijsmans (jasper at xfce.org)
>  *                     2003 Biju Chacko (botsie at users.sourceforge.net)
>  *                     2004 Danny Milosavljevic <danny.milo at gmx.net>
>  *                     2004 Brian Tarricone <bjt23 at cornell.edu>
>@@ -192,7 +192,8 @@
> 	modified = xfce_desktop_menu_need_update_impl(desktop_menu);
> 	
> 	newfilename = desktop_menu_file_get_menufile();
>-	if(strcmp(desktop_menu->filename, newfilename)) {
>+	if(!desktop_menu->filename || 
>+	   strcmp(desktop_menu->filename, newfilename)) {
> 		g_free(desktop_menu->filename);
> 		desktop_menu->filename = newfilename;
> 		modified = TRUE;
>
>_______________________________________________
>Xfce4-commits mailing list
>Xfce4-commits at xfce.org
>http://lunar-linux.org/mailman/listinfo/xfce4-commits
>
>
>  
>