Added check to prevent extensions from injecting scrips into other extensions

chrome/renderer/extensions/user_script_slave.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/extensions/user_script_slave.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 253 matching lines @@
 
   std::set<std::string> extensions_executing_scripts;
 
   for (size_t i = 0; i < scripts_.size(); ++i) {
     std::vector<WebScriptSource> sources;
     UserScript* script = scripts_[i];
 
     if (frame->parent() && !script->match_all_frames())
       continue;  // Only match subframes if the script declared it wanted to.
 
+    WebFrame* parent_frame = frame;
+    while (parent_frame->parent())
+      parent_frame = parent_frame->parent();

[abarth-chromium, 2012/08/22 00:54:19]

Does WebFrame really not have a top() accessor?

[zel, 2012/08/22 01:39:20]

Done.

+
     const Extension* extension = extensions_->GetByID(script->extension_id());
 
     // Since extension info is sent separately from user script info, they can
     // be out of sync. We just ignore this situation.
     if (!extension)
       continue;
 
     // Content scripts are not tab-specific.
     int kNoTabId = -1;
     if (!extension->CanExecuteScriptOnPage(data_source_url,
+                                           parent_frame->document().url(),

[abarth-chromium, 2012/08/22 00:54:19]

parent_frame is really the top_frame or what we call elsewhere the main_frame.

[zel, 2012/08/22 01:39:20]

used frame->top() accessor instead. done.

                                            kNoTabId,
                                            script,
                                            NULL)) {
       continue;
     }
 
     // We rely on WebCore for CSS injection, but it's still useful to know how
     // many css files there are.
     if (location == UserScript::DOCUMENT_START)
       num_css += script->css_scripts().size();
@@ skipping 66 matching lines @@
   } else if (location == UserScript::DOCUMENT_IDLE) {
     UMA_HISTOGRAM_COUNTS_100("Extensions.InjectIdle_ScriptCount", num_scripts);
     if (num_scripts)
       UMA_HISTOGRAM_TIMES("Extensions.InjectIdle_Time", timer.Elapsed());
   } else {
     NOTREACHED();
   }
 }
 
 }  // namespace extensions