Merge pull request #3495 from simophin/patch-1

Guard against out-of-range timestamp
google · Nov 27, 2017 · ec2fbe5 · ec2fbe5
2 parents 818d5a0 + 77d8c13
commit ec2fbe5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
@@ -306,7 +306,7 @@ private long peekId3PrivTimestamp(ExtractorInput input) throws IOException, Inte
         if (PRIV_TIMESTAMP_FRAME_OWNER.equals(privFrame.owner)) {
           System.arraycopy(privFrame.privateData, 0, id3Data.data, 0, 8 /* timestamp size */);
           id3Data.reset(8);
-          return id3Data.readLong();
+          return id3Data.readLong() & ((1L << 33) - 1L);
         }
       }
     }