Bug 1287397 - Fix wave chunk size overflow; r=cpearce

MozReview-Commit-ID: Dg1OT13urxe

--HG--
extra : rebase_source : 60f57edf43f7fb7c83b6db25dffb240993ec5523

dom/media/wave/WaveDemuxer.cpp

@@ -113,8 +113,6 @@ WAVTrackDemuxer::Init()
     uint32_t aChunkName = mHeaderParser.GiveHeader().ChunkName();
     uint32_t aChunkSize = mHeaderParser.GiveHeader().ChunkSize();
 
-    aChunkSize += aChunkSize % 2;
-
     if (aChunkName == FRMT_CODE) {
       if (!FmtChunkParserInit()) {
         return false;
@@ -135,7 +133,8 @@ WAVTrackDemuxer::Init()
       }
       break;
     } else {
-      mOffset += aChunkSize; // Skip other irrelevant chunks.
+      // Wave files are 2-byte aligned so we need to round up
+      mOffset += (aChunkSize + 1) & ~1; // Skip other irrelevant chunks.
     }
     mHeaderParser.Reset();
   }