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

Unified Diff: extensions/browser/api/execute_code_function.cc

Issue 615703002: Verify that ComponentExtensionResourceManager exists before using it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/execute_code_function.cc
diff --git a/extensions/browser/api/execute_code_function.cc b/extensions/browser/api/execute_code_function.cc
index 6df92b488f61c73ead15aa0ff200ca679745645f..63d1bfef46cc0f34025e95bd25177ca58dc19694 100644
--- a/extensions/browser/api/execute_code_function.cc
+++ b/extensions/browser/api/execute_code_function.cc
@@ -206,11 +206,13 @@ bool ExecuteCodeFunction::RunAsync() {
}
int resource_id;
- if (ExtensionsBrowserClient::Get()
- ->GetComponentExtensionResourceManager()
- ->IsComponentExtensionResource(resource_.extension_root(),
- resource_.relative_path(),
- &resource_id)) {
+ ComponentExtensionResourceManager* component_extension_resource_manager =
+ ExtensionsBrowserClient::Get()->GetComponentExtensionResourceManager();
+ if (component_extension_resource_manager &&
+ component_extension_resource_manager->IsComponentExtensionResource(
+ resource_.extension_root(),
+ resource_.relative_path(),
+ &resource_id)) {
const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
DidLoadFile(true, rb.GetRawDataResource(resource_id).as_string());
} else {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698