Bug 723473: Fix crash with Flashblock, regression from bug 90268. r=josh
authorBenjamin Smedberg <benjamin@smedbergs.us>
Wed, 08 Feb 2012 18:15:16 -0500
changeset 89690 7c0ba1c98ff7f87127602ef33c0736acb0dce1e8
parent 89689 65f4832b1e96fb61ad699e0452a6995169d2229f
child 89696 ca84ab42bd5ba7d402f92830a0efa0e94709ab02
child 112671 ed637f826ef6c4c5e32cce51d6477203dd2b9d50
push id136
push userlsblakk@mozilla.com
push dateFri, 01 Jun 2012 02:39:32 +0000
treeherdermozilla-release@7ebf7352c959 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjosh
bugs723473, 90268
milestone13.0a1
first release with
nightly linux32
7c0ba1c98ff7 / 13.0a1 / 20120209031242 / files
nightly linux64
7c0ba1c98ff7 / 13.0a1 / 20120209031242 / files
nightly mac
7c0ba1c98ff7 / 13.0a1 / 20120209031242 / files
nightly win32
7c0ba1c98ff7 / 13.0a1 / 20120209031242 / files
nightly win64
7c0ba1c98ff7 / 13.0a1 / 20120209031242 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 723473: Fix crash with Flashblock, regression from bug 90268. r=josh
content/base/src/nsObjectLoadingContent.cpp
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -1954,16 +1954,17 @@ nsObjectLoadingContent::SyncStartPluginI
                "Must be able to run script in order to instantiate a plugin instance!");
 
   // Don't even attempt to start an instance unless the content is in the document.
   nsCOMPtr<nsIContent> thisContent = do_QueryInterface(static_cast<nsIImageLoadingContent*>(this));
   if (!thisContent->IsInDoc()) {
     return NS_ERROR_FAILURE;
   }
 
+  nsCOMPtr<nsIURI> kungFuURIGrip(mURI);
   return InstantiatePluginInstance(mContentType.get(), mURI.get());
 }
 
 NS_IMETHODIMP
 nsObjectLoadingContent::AsyncStartPluginInstance()
 {
   // OK to have an instance already.
   if (mInstanceOwner) {