debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Avoid allocating empty mime_type and news_feeds

Browse source
This commit is contained in:
Christian Dywan 2011-10-10 21:58:19 +02:00
parent d013cc85a9
commit be6d6932f8
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
midori/midori-view.c
View file

@ -753,6 +753,8 @@ midori_view_update_icon (MidoriView* view,
if (!((screen = gtk_widget_get_screen (GTK_WIDGET (view))) if (!((screen = gtk_widget_get_screen (GTK_WIDGET (view)))
&& (theme = gtk_icon_theme_get_for_screen (screen)))) && (theme = gtk_icon_theme_get_for_screen (screen))))
return; return;
if (view->mime_type == NULL)
return;
if (!((parts = g_strsplit (view->mime_type, "/", 2)) && (*parts && parts[1]))) if (!((parts = g_strsplit (view->mime_type, "/", 2)) && (*parts && parts[1])))
{ {
@ -1541,7 +1543,10 @@ webkit_web_view_load_finished_cb (WebKitWebView* web_view,
guint i = 0; guint i = 0;
gchar* default_uri = NULL; gchar* default_uri = NULL;
katze_array_clear (view->news_feeds); if (view->news_feeds != NULL)
katze_array_clear (view->news_feeds);
else
view->news_feeds = katze_array_new (KATZE_TYPE_ITEM);
if (items != NULL) if (items != NULL)
while (items[i] != NULL) while (items[i] != NULL)
{ {
@ -3039,7 +3044,7 @@ midori_view_init (MidoriView* view)
view->uri = NULL; view->uri = NULL;
view->title = NULL; view->title = NULL;
view->security = MIDORI_SECURITY_NONE; view->security = MIDORI_SECURITY_NONE;
view->mime_type = g_strdup (""); view->mime_type = NULL;
view->icon = NULL; view->icon = NULL;
view->icon_uri = NULL; view->icon_uri = NULL;
view->memory = midori_view_get_memory (); view->memory = midori_view_get_memory ();
@ -3050,7 +3055,7 @@ midori_view_init (MidoriView* view)
view->hit_test = NULL; view->hit_test = NULL;
view->link_uri = NULL; view->link_uri = NULL;
view->selected_text = NULL; view->selected_text = NULL;
view->news_feeds = katze_array_new (KATZE_TYPE_ITEM); view->news_feeds = NULL;
view->find_links = -1; view->find_links = -1;
view->alerts = 0; view->alerts = 0;
@ -4783,7 +4788,7 @@ midori_view_can_zoom_in (MidoriView* view)
return view->web_view != NULL return view->web_view != NULL
&& (katze_object_get_boolean (view->settings, "zoom-text-and-images") && (katze_object_get_boolean (view->settings, "zoom-text-and-images")
|| !g_str_has_prefix (view->mime_type, "image/")); || !g_str_has_prefix (view->mime_type ? view->mime_type : "", "image/"));
} }
gboolean gboolean
@ -4793,7 +4798,7 @@ midori_view_can_zoom_out (MidoriView* view)
return view->web_view != NULL return view->web_view != NULL
&& (katze_object_get_boolean (view->settings, "zoom-text-and-images") && (katze_object_get_boolean (view->settings, "zoom-text-and-images")
|| !g_str_has_prefix (view->mime_type, "image/")); || !g_str_has_prefix (view->mime_type ? view->mime_type : "", "image/"));
} }
gboolean gboolean
@ -4805,7 +4810,7 @@ midori_view_can_view_source (MidoriView* view)
g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
if (midori_view_is_blank (view)) if (midori_view_is_blank (view) || view->mime_type == NULL)
return FALSE; return FALSE;
content_type = g_content_type_from_mime_type (view->mime_type); content_type = g_content_type_from_mime_type (view->mime_type);