From: Alexander Strasser Date: Sun, 13 May 2012 21:13:37 +0000 (+0200) Subject: midori_view_set_uri: Work-around about:version crash X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5dd1f9ab512399f2f9ca316807c4380320a96f6;p=midori midori_view_set_uri: Work-around about:version crash On some systems (e.g. x86_64 linux) midori crashes when trying to visit "about:version". The crash happens in some printf function deeper in the call stack. But I have a theory that much stack space is occupied already before calling g_strdup_printf. I have not analyzed the situation more closely. This fixes the crash by splitting the generation of the version information page into multiple calls. If my theory is correct, it should now only work because I reduced peak stack usage. --- diff --git a/midori/midori-view.c b/midori/midori-view.c index aa49de77..934b68bb 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -4315,12 +4315,47 @@ midori_view_set_uri (MidoriView* view, WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)); JSContextRef js_context = webkit_web_frame_get_global_context (web_frame); gchar* video_formats = list_video_formats (js_context); + + /* FIXME: This is for workarounding a crash deeper down the callstack on some systems. */ + static char const * const version_format_strings[] = { + "libsoup%s", + "cairo%s ", + "(%s)", + "granite%s", + "libnotify%s", + "single instance%s", + "Platform%s ", + "%s ", + "%s", + "Identification%s", + "Video Formats%s", + }; + char const * version_strings[] = { + LIBSOUP_VERSION, + CAIRO_VERSION_STRING, cairo_version_string (), + GRANITE_VERSION, + LIBNOTIFY_VERSION, + #ifdef HAVE_HILDON_2_2 + "Hildon 2.2", + #elif HAVE_HILDON + "Hildon", + #elif HAVE_UNIQUE + "libunique " UNIQUE_VERSION, + #else + "Sockets", + #endif + platform, sys_name, architecture ? architecture : "", ident, + video_formats, + }; + int i = 0; + GString * tmp = g_string_new("");; + GString* more = g_string_new (""); list_netscape_plugins (more, js_context); list_about_uris (more); katze_assign (view->uri, g_strdup (uri)); - data = g_strdup_printf ( + g_string_append_printf (tmp, "about:version" "

about:version

" "

%s

" @@ -4331,18 +4366,7 @@ midori_view_set_uri (MidoriView* view, "Midori%s (%s)" "WebKitGTK+%d.%d.%d (%d.%d.%d)" "GTK+%d.%d.%d (%d.%d.%d)" - "Glib%d.%d.%d (%d.%d.%d)" - "libsoup%s" - "cairo%s (%s)" - "granite%s" - "libnotify%s" - "single instance%s" - "Platform%s %s %s" - "Identification%s" - "Video Formats%s" - "" - "%s" - "", + "Glib%d.%d.%d (%d.%d.%d)", _("Version numbers in brackets show the version used at runtime."), command_line, PACKAGE_VERSION, midori_app_get_name (NULL), @@ -4353,22 +4377,18 @@ midori_view_set_uri (MidoriView* view, GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION, gtk_major_version, gtk_minor_version, gtk_micro_version, GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION, - glib_major_version, glib_minor_version, glib_micro_version, - LIBSOUP_VERSION, - CAIRO_VERSION_STRING, cairo_version_string (), - GRANITE_VERSION, - LIBNOTIFY_VERSION, - #ifdef HAVE_HILDON_2_2 - "Hildon 2.2", - #elif HAVE_HILDON - "Hildon", - #elif HAVE_UNIQUE - "libunique " UNIQUE_VERSION, - #else - "Sockets", - #endif - platform, sys_name, architecture ? architecture : "", ident, - video_formats, (gchar*)(more->str)); + glib_major_version, glib_minor_version, glib_micro_version); + + for (i = 0; + i < sizeof (version_format_strings) / sizeof (version_format_strings[0]); + ++i) + g_string_append_printf (tmp, version_format_strings[i], version_strings[i]); + + g_string_append_printf ( + tmp, "%s", (gchar*)(more->str)); + + data = g_string_free (tmp, FALSE); + g_free (command_line); g_free (arguments); g_free (ident);