Bug 1264991: Don't construct invalid channel configuration. r?gerald draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Sat, 16 Apr 2016 14:35:32 +1000
changeset 352247 28203458a287b827b46b64c480380a7f23e2d11e
parent 352236 f5a97eb5c89a2b5133ff8bba915acba6344fa7cc
child 518623 4d7ddec629e5f5dc2e0ee4b7b56f6d5f8005b7fe
push id15661
push userbmo:jyavenard@mozilla.com
push dateSat, 16 Apr 2016 04:39:49 +0000
reviewersgerald
bugs1264991
milestone48.0a1
Bug 1264991: Don't construct invalid channel configuration. r?gerald MozReview-Commit-ID: JTZJdCD94gH
dom/media/MediaInfo.h
--- a/dom/media/MediaInfo.h
+++ b/dom/media/MediaInfo.h
@@ -499,16 +499,20 @@ public:
       : mChannelMap(0)
       , mValid(false)
     {}
     explicit ChannelLayout(uint32_t aChannels)
       : ChannelLayout(aChannels, SMPTEDefault(aChannels))
     {}
     ChannelLayout(uint32_t aChannels, const Channel* aConfig)
     {
+      if (!aConfig) {
+        mValid = false;
+        return;
+      }
       mChannels.AppendElements(aConfig, aChannels);
       UpdateChannelMap();
     }
     bool operator==(const ChannelLayout& aOther) const
     {
       return mChannels == aOther.mChannels;
     }
     bool operator!=(const ChannelLayout& aOther) const