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

Check whether the header file was created and mkdir the parent folder

Browse source 
When the web cache folder is deleted, the filenames passed to callbacks
may not be updated, so trying to write headers results in a crash.
We need to make sure we only write after opening the file properly.
This commit is contained in:
Alexander Butenko 2009-12-27 22:00:39 +01:00 committed by Christian Dywan
parent 3aeb60ec83
commit 33565cc2f3
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
extensions/web-cache.c
View file

@ -41,7 +41,7 @@ web_cache_get_cached_path (MidoriExtension* extension,
checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1); checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
folder = g_strdup_printf ("%c%c", checksum[0], checksum[1]); folder = g_strdup_printf ("%c%c", checksum[0], checksum[1]);
sub_path = g_build_path (G_DIR_SEPARATOR_S, cache_path, folder, NULL); sub_path = g_build_path (G_DIR_SEPARATOR_S, cache_path, folder, NULL);
g_mkdir (sub_path, 0700); katze_mkdir_with_parents (sub_path, 0700);
g_free (folder); g_free (folder);
encoded = soup_uri_encode (uri, "/"); encoded = soup_uri_encode (uri, "/");
@ -58,7 +58,7 @@ web_cache_get_cached_path (MidoriExtension* extension,
return cached_path; return cached_path;
} }
static void static gboolean
web_cache_save_headers (SoupMessage* msg, web_cache_save_headers (SoupMessage* msg,
gchar* filename) gchar* filename)
{ {
@ -70,11 +70,15 @@ web_cache_save_headers (SoupMessage* msg,
soup_message_headers_iter_init (&iter, hdrs); soup_message_headers_iter_init (&iter, hdrs);
dscfd = g_fopen (dsc_filename, "w"); dscfd = g_fopen (dsc_filename, "w");
g_free (dsc_filename);
if (!dscfd)
return FALSE;
while (soup_message_headers_iter_next (&iter, &name, &value)) while (soup_message_headers_iter_next (&iter, &name, &value))
g_fprintf (dscfd, "%s: %s\n", name, value); g_fprintf (dscfd, "%s: %s\n", name, value);
fclose (dscfd); fclose (dscfd);
g_free (dsc_filename); return TRUE;
} }
GHashTable* GHashTable*
@ -281,13 +285,15 @@ web_cache_mesage_got_headers_cb (SoupMessage* msg,
g_free (uri); g_free (uri);
return; return;
} }
web_cache_save_headers (msg, filename); if (web_cache_save_headers (msg, filename))
{
g_signal_connect_data (msg, "got-chunk", g_signal_connect_data (msg, "got-chunk",
G_CALLBACK (web_cache_message_got_chunk_cb), G_CALLBACK (web_cache_message_got_chunk_cb),
filename, (GClosureNotify)g_free, 0); filename, (GClosureNotify)g_free, 0);
g_signal_connect (msg, "finished", g_signal_connect (msg, "finished",
G_CALLBACK (web_cache_message_finished_cb), filename); G_CALLBACK (web_cache_message_finished_cb), filename);
} }
}
g_free (uri); g_free (uri);
} }