Merge lp:~luszczyk/sakura/reviews into lp:~dabisu/sakura/sakura

[Michał Łuszczyk]

Fixed an error, that causes SEGFAULT when calling sakura_error with few arguments, e.g. when no browser is found in sakura_open_url.

[lp:~luszczyk/sakura/reviews]

331. By Michał Łuszczyk on 2010-10-19

Freeing allocated memory

[David Gómez (dabisu)]

Thanks! Sorry for the delay

[David Gómez (dabisu)]

review: Approve

=== modified file 'src/sakura.c'
--- src/sakura.c	2010-10-06 13:45:12 +0000
+++ src/sakura.c	2010-10-19 19:14:02 +0000
@@ -229,6 +229,7 @@
 #define DEFAULT_PASTE_KEY  GDK_V
 #define DEFAULT_SCROLLBAR_KEY  GDK_S
 #define DEFAULT_FULLSCREEN_KEY  GDK_F11
+#define ERROR_BUFFER_LENGTH 256
 const char cfg_group[] = "sakura";
 
 static GQuark term_data_id = 0;
@@ -2403,15 +2404,18 @@
 {
 	GtkWidget *dialog;
 	va_list args;
+	char* buff;
 
 	va_start(args, format);
+	buff = malloc(sizeof(char)*ERROR_BUFFER_LENGTH);
+	vsnprintf(buff, sizeof(char)*ERROR_BUFFER_LENGTH, format, args);
+	va_end(args);
 
 	dialog = gtk_message_dialog_new(GTK_WINDOW(sakura.main_window), GTK_DIALOG_DESTROY_WITH_PARENT,
-	                                GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, format, args);
+	                                GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", buff);
 	gtk_dialog_run (GTK_DIALOG (dialog));
-
-	va_end(args);
 	gtk_widget_destroy (dialog);
+	free(buff);
 }