sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correctly handle reading of an empty string without a terminating NUL byte

Browse source 
Issue: #2152

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=141159330
This commit is contained in:
olly 2016-12-06 03:16:31 -08:00 committed by Oliver Woodman
parent e86bfd6dbe
commit 9ea8b02083
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java
View file

@ -431,6 +431,9 @@ public final class ParsableByteArray {
* @return The string encoded by the bytes. * @return The string encoded by the bytes.
*/ */
public String readNullTerminatedString(int length) { public String readNullTerminatedString(int length) {
if (length == 0) {
return "";
}
int stringLength = length; int stringLength = length;
int lastIndex = position + length - 1; int lastIndex = position + length - 1;
if (lastIndex < limit && data[lastIndex] == 0) { if (lastIndex < limit && data[lastIndex] == 0) {