From 698e081edab82c4293de0ada171d6bcb3eacd3fc Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 22 Feb 2017 07:39:05 -0800
Subject: [PATCH] Handle empty PRIV frames

Issue: #2486

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=148217936
---
 .../google/android/exoplayer2/metadata/id3/Id3Decoder.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
index 16059ccfbf..d5f5b08370 100644
--- a/library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
+++ b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
@@ -404,6 +404,11 @@ public final class Id3Decoder implements MetadataDecoder {
 
   private static PrivFrame decodePrivFrame(ParsableByteArray id3Data, int frameSize)
       throws UnsupportedEncodingException {
+    if (frameSize == 0) {
+      // Frame is empty.
+      return new PrivFrame("", new byte[0]);
+    }
+
     byte[] data = new byte[frameSize];
     id3Data.readBytes(data, 0, frameSize);