Bug 1290749 - Skip plugin content plugin of no URI specified. r=francois a=lizzard
authorTobias Schneider <schneider@jancona.com>
Tue, 26 Jul 2016 10:59:41 -0700
changeset 349700 4d51664244aad86fbd00bed49ca41da1227bcdef
parent 349699 858abdc854851e153a60b414e09f3a2375963bdc
child 349701 0c747cd335a77578aff1a1af0e1d363a7fd12e23
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrancois, lizzard
bugs1290749
milestone50.0a2
Bug 1290749 - Skip plugin content plugin of no URI specified. r=francois a=lizzard
dom/base/nsObjectLoadingContent.cpp
--- a/dom/base/nsObjectLoadingContent.cpp
+++ b/dom/base/nsObjectLoadingContent.cpp
@@ -3366,17 +3366,17 @@ nsObjectLoadingContent::GetRunID(uint32_
 
 static bool sPrefsInitialized;
 static uint32_t sSessionTimeoutMinutes;
 static uint32_t sPersistentTimeoutDays;
 
 bool
 nsObjectLoadingContent::ShouldBlockContent()
 {
-  if (mContentBlockingDisabled)
+  if (mContentBlockingDisabled || !mURI)
     return false;
 
   if (!IsFlashMIME(mContentType) || !Preferences::GetBool(kPrefBlockURIs)) {
     mContentBlockingDisabled = true;
     return false;
   }
 
   return true;