| commit | c54e073a4934cf2cd6fdcfa2ce6b7173b350fbe3 | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@android.com> | Sat Oct 31 00:35:06 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 31 00:35:06 2020 +0000 |
| tree | 601098fb8ff55254d532b7d14e378193c7625571 | |
| parent | 2b01dc7b33b60f9992654f2f26d2e157e4db3048 [diff] | |
| parent | 67a8528aa6126b604adfcacc266a3f299dd5dcf0 [diff] |
Merge "Add low-level methods for simple non-atomic indices" am: a5dfba5615 am: eee66b07b6 am: 67a8528aa6 Original change: https://android-review.googlesource.com/c/platform/system/media/+/1478681 Change-Id: If0fc6ee980c2f8b115e488e93c75533877d92249
diff --git a/audio_utils/spdif/SPDIFEncoder.cpp b/audio_utils/spdif/SPDIFEncoder.cpp index 4a8a02a..60b8425 100644 --- a/audio_utils/spdif/SPDIFEncoder.cpp +++ b/audio_utils/spdif/SPDIFEncoder.cpp
@@ -140,6 +140,12 @@ clearBurstBuffer(); return; } + + // Avoid reading first word past end of mBurstBuffer. + if (numBytes == 0) { + return; + } + // Pack bytes into short buffer. uint16_t pad = mBurstBuffer[mByteCursor >> 1]; for (size_t i = 0; i < numBytes; i++) { if (mByteCursor & 1 ) {