Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: chrome/renderer/extensions/user_script_slave.cc

Issue 8044003: Fix a crash when loading a multipart html page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: check() Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/content_script_apitest.cc ('k') | net/tools/testserver/testserver.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/extensions/user_script_slave.cc
diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc
index dbdec7924398e6dc019162ca012d5d2ff5ce45de..a623416d2704105bf9ac9463fc53831bba54ee85 100644
--- a/chrome/renderer/extensions/user_script_slave.cc
+++ b/chrome/renderer/extensions/user_script_slave.cc
@@ -239,7 +239,10 @@ void UserScriptSlave::InjectScripts(WebFrame* frame,
// changes to match the parent document after Gmail document.writes into
// it to create the editor.
// http://code.google.com/p/chromium/issues/detail?id=86742
- GURL data_source_url = GURL(frame->dataSource()->request().url());
+ WebKit::WebDataSource* data_source = frame->dataSource() ?
+ frame->dataSource() : frame->provisionalDataSource();
+ CHECK(data_source);
+ GURL data_source_url = GURL(data_source->request().url());
if (data_source_url.is_empty())
return;
« no previous file with comments | « chrome/browser/extensions/content_script_apitest.cc ('k') | net/tools/testserver/testserver.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698