Commit a08b8a8c authored by Wes Kocher's avatar Wes Kocher
Browse files

Merge m-c to autoland, a=merge 

MozReview-Commit-ID: KmdITOdRCqU
parents 8c1f7ef5 ea31c4b6

browser/app/blocklist.xml

+6 −22
Original line number Diff line number Diff line
@@ -2143,16 +2143,12 @@ 
      <versionRange maxVersion="13.0.0.302" minVersion="13.0.0.302" severity="0" vulnerabilitystatus="1"/>

    </pluginItem>

    <pluginItem blockID="p1495" os="Linux">

      <match exp="" name="name"/>

      <match exp="libflashplayer\.so" name="filename"/>

      <match exp="" name="description"/>

      <infoURL>https://get.adobe.com/flashplayer/</infoURL>

      <versionRange maxVersion="24.0.0.186" minVersion="23.0.0.207" severity="0" vulnerabilitystatus="1"/>

    </pluginItem>

    <pluginItem blockID="p1420" os="">

      <match exp="" name="name"/>

    <pluginItem blockID="p1420">

      <match exp="(NPSWF32.*\.dll)|(NPSWF64.*\.dll)|(Flash\ Player\.plugin)" name="filename"/>

      <match exp="" name="description"/>

      <infoURL>https://get.adobe.com/flashplayer/</infoURL>

      <versionRange maxVersion="23.0.0.205" minVersion="23.0.0.185" severity="0" vulnerabilitystatus="1"/>

    </pluginItem>
@@ -2206,9 +2202,7 @@ 
      <versionRange maxVersion="*" minVersion="0"/>

    </pluginItem>

    <pluginItem blockID="p1419" os="Linux">

      <match exp="" name="name"/>

      <match exp="libflashplayer\.so" name="filename"/>

      <match exp="" name="description"/>

      <infoURL>https://get.adobe.com/flashplayer/</infoURL>

      <versionRange maxVersion="11.2.202.643" minVersion="11.2.202.637" severity="0" vulnerabilitystatus="1"/>

    </pluginItem>
@@ -2465,10 +2459,8 @@ 
      <infoURL>https://get.adobe.com/flashplayer/</infoURL>

      <versionRange maxVersion="18.0.0.232" minVersion="18.0.0.204" severity="0" vulnerabilitystatus="1"/>

    </pluginItem>

    <pluginItem blockID="p1274" os="">

      <match exp="" name="name"/>

    <pluginItem blockID="p1274">

      <match exp="(NPSWF32.*\.dll)|(NPSWF64.*\.dll)|(Flash\ Player\.plugin)" name="filename"/>

      <match exp="" name="description"/>

      <infoURL>https://get.adobe.com/flashplayer/</infoURL>

      <versionRange maxVersion="22.0.0.211" minVersion="22.0.0.192" severity="0" vulnerabilitystatus="1"/>

    </pluginItem>
@@ -2579,10 +2571,8 @@ 
        </targetApplication>

      </versionRange>

    </pluginItem>

    <pluginItem blockID="p1494" os="">

      <match exp="" name="name"/>

    <pluginItem blockID="p1494">

      <match exp="(NPSWF32.*\.dll)|(NPSWF64.*\.dll)|(Flash\ Player\.plugin)" name="filename"/>

      <match exp="" name="description"/>

      <infoURL>https://get.adobe.com/flashplayer/</infoURL>

      <versionRange maxVersion="24.0.0.186" minVersion="23.0.0.207" severity="0" vulnerabilitystatus="1"/>

    </pluginItem>
@@ -2650,10 +2640,8 @@ 
      <infoURL>https://get.adobe.com/flashplayer/</infoURL>

      <versionRange maxVersion="18.0.0.352" minVersion="18.0.0.343" severity="0" vulnerabilitystatus="1"/>

    </pluginItem>

    <pluginItem blockID="p160" os="">

      <match exp="" name="name"/>

    <pluginItem blockID="p160">

      <match exp="NPSWF32\.dll" name="filename"/>

      <match exp="" name="description"/>

      <infoURL>https://get.adobe.com/flashplayer/</infoURL>

      <versionRange maxVersion="10.2.9999" minVersion="0" severity="0" vulnerabilitystatus="1">

        <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
@@ -2821,10 +2809,8 @@ 
    <pluginItem blockID="p28">

      <match exp="NPFFAddOn.dll" name="filename"/>

    </pluginItem>

    <pluginItem blockID="p1421" os="Linux">

      <match exp="" name="name"/>

    <pluginItem blockID="p1421">

      <match exp="libflashplayer\.so" name="filename"/>

      <match exp="" name="description"/>

      <infoURL>https://get.adobe.com/flashplayer/</infoURL>

      <versionRange maxVersion="23.0.0.207" minVersion="11.2.202.643" severity="0" vulnerabilitystatus="1"/>

    </pluginItem>
@@ -3020,10 +3006,8 @@ 
      <infoURL>https://get.adobe.com/reader</infoURL>

      <versionRange maxVersion="15.006.30174" minVersion="15.006.30174" severity="0" vulnerabilitystatus="1"/>

    </pluginItem>

    <pluginItem blockID="p1422" os="">

      <match exp="" name="name"/>

    <pluginItem blockID="p1422">

      <match exp="(NPSWF32.*\.dll)|(NPSWF64.*\.dll)|(Flash\ Player\.plugin)" name="filename"/>

      <match exp="" name="description"/>

      <infoURL>https://get.adobe.com/flashplayer/</infoURL>

      <versionRange maxVersion="23.0.0.207" minVersion="23.0.0.205" severity="0" vulnerabilitystatus="1"/>

    </pluginItem>

config/system-headers

+1 −0
Original line number Diff line number Diff line
@@ -1056,6 +1056,7 @@ sys/statvfs.h 
sys/syscall.h

sys/sysctl.h

sys/sysinfo.h

sys/sysmacros.h

sys/sysmp.h

sys/syssgi.h

sys/system_properties.h

docshell/base/crashtests/1331295.html

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!DOCTYPE html>

<html>

<head>

<meta charset="UTF-8">

<script>

function boom() {

  setTimeout(function(){

    var o=document.getElementById('b');

    document.getElementById('a').appendChild(o.parentNode.removeChild(o));

  },0);

  var o=document.getElementById('c');

  var p=document.getElementById('b');

  p.id=[o.id, o.id=p.id][0];

  o=document.getElementById('b');

  o.setAttribute('sandbox', 'disc');

  window.location.reload(true);

}

</script>

</head>

<body onload="boom();">

<header id='a'></header>

<output id='b'></output>

<iframe id='c' sandbox='allow-same-origin' src='http://a'></iframe>

</body>

</html>

docshell/base/crashtests/crashtests.list

+1 −0
Original line number Diff line number Diff line
@@ -13,3 +13,4 @@ load 614499-1.html 
load 678872-1.html

skip-if(Android) pref(dom.disable_open_during_load,false) load 914521.html

pref(browser.send_pings,true) load 1257730-1.html

load 1331295.html

docshell/base/nsDocShell.cpp

+5 −1
Original line number Diff line number Diff line
@@ -8100,7 +8100,11 @@ nsDocShell::CreateAboutBlankContentViewer(nsIPrincipal* aPrincipal, 
  if (docFactory) {

    nsCOMPtr<nsIPrincipal> principal;

    if (mSandboxFlags & SANDBOXED_ORIGIN) {

      if (aPrincipal) {

        principal = nsNullPrincipal::CreateWithInheritedAttributes(aPrincipal);

      } else {

        principal = nsNullPrincipal::CreateWithInheritedAttributes(this);

      }

    } else {

      principal = aPrincipal;

    }