From 9ea8b02083f4d1fd12abc7f9835a8f7a4a4b361e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 6 Dec 2016 03:16:31 -0800
Subject: [PATCH] Correctly handle reading of an empty string without a
 terminating NUL byte

Issue: #2152

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=141159330
---
 .../com/google/android/exoplayer2/util/ParsableByteArray.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java b/library/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java
index 05c29ca032..b8d635a053 100644
--- a/library/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java
+++ b/library/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java
@@ -431,6 +431,9 @@ public final class ParsableByteArray {
    * @return The string encoded by the bytes.
    */
   public String readNullTerminatedString(int length) {
+    if (length == 0) {
+      return "";
+    }
     int stringLength = length;
     int lastIndex = position + length - 1;
     if (lastIndex < limit && data[lastIndex] == 0) {