Bug 1281408 - Nullcheck `mInputPort` in MediaStreamAudioSourceNode to prevent crashing when getting memory reports after the underlying MediaStream has been destroyed. r?pehrsons draft
authorPaul Adenot <paul@paul.cx>
Wed, 22 Jun 2016 18:20:46 +0200
changeset 380674 d9da19dbdf2afb52b1e4bb1544b82cc486ec84cd
parent 380664 4ee98983d6d7aeb3c52cd8017a1db3a9068b2f87
child 380928 c58c2663bde4d4016394b510ee3cbff6868df294
push id21278
push userpaul@paul.cx
push dateWed, 22 Jun 2016 16:21:08 +0000
reviewerspehrsons
bugs1281408
milestone50.0a1
Bug 1281408 - Nullcheck `mInputPort` in MediaStreamAudioSourceNode to prevent crashing when getting memory reports after the underlying MediaStream has been destroyed. r?pehrsons MozReview-Commit-ID: 7OzFPmLVJA5
dom/media/webaudio/MediaStreamAudioSourceNode.cpp
--- a/dom/media/webaudio/MediaStreamAudioSourceNode.cpp
+++ b/dom/media/webaudio/MediaStreamAudioSourceNode.cpp
@@ -193,17 +193,19 @@ MediaStreamAudioSourceNode::PrincipalCha
 }
 
 size_t
 MediaStreamAudioSourceNode::SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const
 {
   // Future:
   // - mInputStream
   size_t amount = AudioNode::SizeOfExcludingThis(aMallocSizeOf);
-  amount += mInputPort->SizeOfIncludingThis(aMallocSizeOf);
+  if (mInputPort) {
+    amount += mInputPort->SizeOfIncludingThis(aMallocSizeOf);
+  }
   return amount;
 }
 
 size_t
 MediaStreamAudioSourceNode::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
 {
   return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf);
 }