From f519765706210e25a2f448159d4e5f83128a75d0 Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Sat, 9 Jun 2018 08:44:00 -0400 Subject: [PATCH 1/8] Bug 1457092 - Only include SandboxBroker.h header on Linux sandbox. r=gcp --- gfx/thebes/gfxFcPlatformFontList.cpp | 2 +- gfx/thebes/gfxFcPlatformFontList.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/thebes/gfxFcPlatformFontList.cpp b/gfx/thebes/gfxFcPlatformFontList.cpp index 4b9892eb88f7..ab84c770fc8a 100644 --- a/gfx/thebes/gfxFcPlatformFontList.cpp +++ b/gfx/thebes/gfxFcPlatformFontList.cpp @@ -41,7 +41,7 @@ #include "mozilla/X11Util.h" #endif -#ifdef MOZ_CONTENT_SANDBOX +#if defined(MOZ_CONTENT_SANDBOX) && defined (XP_LINUX) #include "mozilla/SandboxBrokerPolicyFactory.h" #include "mozilla/SandboxSettings.h" #endif diff --git a/gfx/thebes/gfxFcPlatformFontList.h b/gfx/thebes/gfxFcPlatformFontList.h index 35d7032e6fca..0a50a64e7419 100644 --- a/gfx/thebes/gfxFcPlatformFontList.h +++ b/gfx/thebes/gfxFcPlatformFontList.h @@ -23,7 +23,7 @@ #include #include -#ifdef MOZ_CONTENT_SANDBOX +#if defined(MOZ_CONTENT_SANDBOX) && defined (XP_LINUX) #include "mozilla/SandboxBroker.h" #endif From 3287f6a4402bfce30e1761b8f572a8df3ae021c2 Mon Sep 17 00:00:00 2001 From: Aki Helin Date: Sat, 9 Jun 2018 16:11:26 +0200 Subject: [PATCH 2/8] Bug 653675 - Add a crashtest. r=mats --- layout/style/crashtests/653675.html | 1 + layout/style/crashtests/crashtests.list | 1 + 2 files changed, 2 insertions(+) create mode 100644 layout/style/crashtests/653675.html diff --git a/layout/style/crashtests/653675.html b/layout/style/crashtests/653675.html new file mode 100644 index 000000000000..da858ba76e39 --- /dev/null +++ b/layout/style/crashtests/653675.html @@ -0,0 +1 @@ + diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list index 23abe2eff5a4..b302e56a806b 100644 --- a/layout/style/crashtests/crashtests.list +++ b/layout/style/crashtests/crashtests.list @@ -77,6 +77,7 @@ load 622314-1.xhtml load 637242.xhtml load 645142.html load 652976-1.svg +load 653675.html load 665209-1.html load 671799-1.html load 671799-2.html From 5a1430954d0b7a53c61cae6fe723e786c0428793 Mon Sep 17 00:00:00 2001 From: Jesse Ruderman Date: Sat, 9 Jun 2018 16:11:26 +0200 Subject: [PATCH 3/8] Bug 635153 - Add a crashtest. r=mats --- layout/style/crashtests/635153.html | 16 ++++++++++++++++ layout/style/crashtests/crashtests.list | 1 + 2 files changed, 17 insertions(+) create mode 100644 layout/style/crashtests/635153.html diff --git a/layout/style/crashtests/635153.html b/layout/style/crashtests/635153.html new file mode 100644 index 000000000000..50f05878a1b6 --- /dev/null +++ b/layout/style/crashtests/635153.html @@ -0,0 +1,16 @@ + + + + + + + diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list index b302e56a806b..ce48b97936fd 100644 --- a/layout/style/crashtests/crashtests.list +++ b/layout/style/crashtests/crashtests.list @@ -74,6 +74,7 @@ load 605689-1.html load 611922-1.html load 621596-1.html load 622314-1.xhtml +load 635153.html load 637242.xhtml load 645142.html load 652976-1.svg From f1e9743b7d6ee5a194f39f378fda86b80610c231 Mon Sep 17 00:00:00 2001 From: Jesse Ruderman Date: Sat, 9 Jun 2018 16:11:26 +0200 Subject: [PATCH 4/8] Bug 694775 - Add a crashtest. r=mats --- layout/style/crashtests/694775.html | 7 +++++++ layout/style/crashtests/crashtests.list | 1 + 2 files changed, 8 insertions(+) create mode 100644 layout/style/crashtests/694775.html diff --git a/layout/style/crashtests/694775.html b/layout/style/crashtests/694775.html new file mode 100644 index 000000000000..2952d5e6e862 --- /dev/null +++ b/layout/style/crashtests/694775.html @@ -0,0 +1,7 @@ + + diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list index ce48b97936fd..3acca9680070 100644 --- a/layout/style/crashtests/crashtests.list +++ b/layout/style/crashtests/crashtests.list @@ -83,6 +83,7 @@ load 665209-1.html load 671799-1.html load 671799-2.html load 690990-1.html +load 694775.html load 696188-1.html load 696869-1.html load 700116.html From bb19d486e555dff7bc53d5ea42a4119a401b468f Mon Sep 17 00:00:00 2001 From: Jesse Ruderman Date: Sat, 9 Jun 2018 16:11:26 +0200 Subject: [PATCH 5/8] Bug 822877 - Add a crashtest. r=mats --- layout/style/crashtests/822877.html | 15 +++++++++++++++ layout/style/crashtests/crashtests.list | 1 + 2 files changed, 16 insertions(+) create mode 100644 layout/style/crashtests/822877.html diff --git a/layout/style/crashtests/822877.html b/layout/style/crashtests/822877.html new file mode 100644 index 000000000000..8dfa192e4905 --- /dev/null +++ b/layout/style/crashtests/822877.html @@ -0,0 +1,15 @@ + + + + + + + diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list index 3acca9680070..7bd9cf060139 100644 --- a/layout/style/crashtests/crashtests.list +++ b/layout/style/crashtests/crashtests.list @@ -96,6 +96,7 @@ load 806310-1.html load 809762.html load 812824.html load 822766-1.html +load 822877.html load 827591-1.html load 829817.html load 842134.html From 34af89ca3d99a179134b80195f834c60c2586b20 Mon Sep 17 00:00:00 2001 From: Jesse Ruderman Date: Sat, 9 Jun 2018 16:11:26 +0200 Subject: [PATCH 6/8] Bug 827220 - Add a crashtest. r=mats --- layout/style/crashtests/827220.html | 5 +++++ layout/style/crashtests/crashtests.list | 1 + 2 files changed, 6 insertions(+) create mode 100644 layout/style/crashtests/827220.html diff --git a/layout/style/crashtests/827220.html b/layout/style/crashtests/827220.html new file mode 100644 index 000000000000..7c1717a1b61c --- /dev/null +++ b/layout/style/crashtests/827220.html @@ -0,0 +1,5 @@ + + + + + diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list index 7bd9cf060139..60855f6d199f 100644 --- a/layout/style/crashtests/crashtests.list +++ b/layout/style/crashtests/crashtests.list @@ -97,6 +97,7 @@ load 809762.html load 812824.html load 822766-1.html load 822877.html +load 827220.html load 827591-1.html load 829817.html load 842134.html From c7da70933510113476784bdee26adb0956e86c6d Mon Sep 17 00:00:00 2001 From: Jesse Ruderman Date: Sat, 9 Jun 2018 16:11:26 +0200 Subject: [PATCH 7/8] Bug 873260 - Add crashtests. r=mats DONTBUILD --- layout/style/crashtests/873260-1.html | 16 ++++++++++++++++ layout/style/crashtests/873260-2.html | 16 ++++++++++++++++ layout/style/crashtests/crashtests.list | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 layout/style/crashtests/873260-1.html create mode 100644 layout/style/crashtests/873260-2.html diff --git a/layout/style/crashtests/873260-1.html b/layout/style/crashtests/873260-1.html new file mode 100644 index 000000000000..9461ef41ad95 --- /dev/null +++ b/layout/style/crashtests/873260-1.html @@ -0,0 +1,16 @@ + + + + + + + diff --git a/layout/style/crashtests/873260-2.html b/layout/style/crashtests/873260-2.html new file mode 100644 index 000000000000..9634389198de --- /dev/null +++ b/layout/style/crashtests/873260-2.html @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list index 60855f6d199f..6c9fe9bcf791 100644 --- a/layout/style/crashtests/crashtests.list +++ b/layout/style/crashtests/crashtests.list @@ -105,6 +105,8 @@ load 861489-1.html load 862113.html load 867487.html load 873222.html +load 873260-1.html +load 873260-2.html load 880862.html load 894245-1.html load 915440.html From e4164ef1b0687f03813a5d5888ed7f904a8951ac Mon Sep 17 00:00:00 2001 From: "Nils Ohlmeier [:drno]" Date: Fri, 8 Jun 2018 19:49:40 -0700 Subject: [PATCH 8/8] Bug 1467938 - Fix out-of-bounds memory access in WebRTC VP9 Missing Frame Processing. r=ng --HG-- extra : histedit_source : f18e4e92f3cdb17b80d092b13dc370386119d437%2C06a923f89cefae172e29d0af18800c401394f940 --- .../video_coding/rtp_frame_reference_finder.cc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/media/webrtc/trunk/webrtc/modules/video_coding/rtp_frame_reference_finder.cc b/media/webrtc/trunk/webrtc/modules/video_coding/rtp_frame_reference_finder.cc index 3d5283378fb5..c7b893cdd456 100644 --- a/media/webrtc/trunk/webrtc/modules/video_coding/rtp_frame_reference_finder.cc +++ b/media/webrtc/trunk/webrtc/modules/video_coding/rtp_frame_reference_finder.cc @@ -434,8 +434,11 @@ void RtpFrameReferenceFinder::ManageFrameVp9( LOG(LS_WARNING) << "Received keyframe without scalability structure"; frame->num_references = 0; - GofInfo info = gof_info_.find(codec_header.tl0_pic_idx)->second; - FrameReceivedVp9(frame->picture_id, &info); + auto gof_info_it = gof_info_.find(codec_header.tl0_pic_idx); + if (gof_info_it == gof_info_.end()) + return; + + FrameReceivedVp9(frame->picture_id, &gof_info_it->second); CompletedFrameVp9(std::move(frame)); return; } @@ -508,6 +511,12 @@ bool RtpFrameReferenceFinder::MissingRequiredFrameVp9(uint16_t picture_id, size_t gof_idx = diff % info.gof->num_frames_in_gof; size_t temporal_idx = info.gof->temporal_idx[gof_idx]; + if (temporal_idx >= kMaxTemporalLayers) { + LOG(LS_WARNING) << "At most " << kMaxTemporalLayers << " temporal " + << "layers are supported."; + return true; + } + // For every reference this frame has, check if there is a frame missing in // the interval (|ref_pid|, |picture_id|) in any of the lower temporal // layers. If so, we are missing a required frame.