brasero r928 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Sat Jun 28 18:54:15 2008
New Revision: 928
URL: http://svn.gnome.org/viewvc/brasero?rev=928&view=rev

Log:
	Possible fix for
	#538953 â crash in Brasero Disc Burning: I was trying to copy a C...
	and 
	#531084 â Brasero crashes in strlen () when debug mode is on

	* src/burn-job.c (brasero_job_log_message):


Modified:
   trunk/ChangeLog
   trunk/src/burn-job.c

Modified: trunk/src/burn-job.c
==============================================================================
--- trunk/src/burn-job.c	(original)
+++ trunk/src/burn-job.c	Sat Jun 28 18:54:15 2008
@@ -82,10 +82,16 @@
 	BraseroJob *linked;
 };
 
-#define BRASERO_JOB_DEBUG(job_MACRO)	brasero_job_log_message (job_MACRO, G_STRLOC,	\
-					"%s called %s", 			\
-					G_OBJECT_TYPE_NAME (job_MACRO),		\
-					G_STRFUNC);
+#define BRASERO_JOB_DEBUG(job_MACRO)						\
+{										\
+	const gchar *class_name_MACRO = NULL;					\
+	if (BRASERO_IS_JOB (job_MACRO))						\
+		class_name_MACRO = G_OBJECT_TYPE_NAME (job_MACRO);		\
+	brasero_job_log_message (job_MACRO, G_STRLOC,				\
+				 "%s called %s", 				\
+				 class_name_MACRO,				\
+				 G_STRFUNC);					\
+}
 
 #define BRASERO_JOB_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_JOB, BraseroJobPrivate))
 
@@ -1823,6 +1829,9 @@
 
 	va_start (arg_list, format);
 	brasero_burn_session_logv (session, format, arg_list);
+	va_end (arg_list);
+
+	va_start (arg_list, format);
 	brasero_burn_debug_messagev (location, format, arg_list);
 	va_end (arg_list);
 }