[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1263334 - Check VBR header is valid before using it for duration calculations. r=esawin - tor-commits

29 Sep 2016

commit 2b459feaa5713f0b2c3d6595e677290cdcc8f9ca
Author: Jan Henning jh+bugzilla@buttercookie.de
Date:   Sat Apr 9 20:38:45 2016 +0200
Bug 1263334 - Check VBR header is valid before using it for duration calculations. r=esawin
MozReview-Commit-ID: KPrn5WeXUuF
--HG--
    extra : transplant_source : E%89%8Cs%1BG%28y%B82%3E%F8%CB%A8Q%B3%1F%EB%94%C2
This fixes our bug 20160.
---
 dom/media/MP3Demuxer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/media/MP3Demuxer.cpp b/dom/media/MP3Demuxer.cpp
index 7780e57..88a20dcb 100644
--- a/dom/media/MP3Demuxer.cpp
+++ b/dom/media/MP3Demuxer.cpp
@@ -347,7 +347,7 @@ MP3TrackDemuxer::Duration() const {
int64_t numFrames = 0;
   const auto numAudioFrames = mParser.VBRInfo().NumAudioFrames();
-  if (numAudioFrames) {
+  if (mParser.VBRInfo().IsValid()) {
     // VBR headers don't include the VBR header frame.
     numFrames = numAudioFrames.value() + 1;
   } else {

    