From 02d7869783899e432b2592d76a4d5c69cd597b5a Mon Sep 17 00:00:00 2001
From: Yamit Mehta <ymehta@codeaurora.org>
Date: Mon, 13 Jul 2015 11:49:05 +0530
Subject: libstagefright: Add check for bits avail to read

- If number of bits available to read from ABitReader
  is zero,do not call getBits.

Change-Id: I4b7332b03ed6ee1d7b6711e5b4c5dce396151b03
CRs-Fixed: 777657
---
 media/libstagefright/MPEG4Extractor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'media')

diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 38ae6f3..e88e90f 100755
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -3123,7 +3123,7 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio(
                         extensionFlag, objectType);
             }
 
-            if (numChannels == 0) {
+            if (numChannels == 0 && (br.numBitsLeft() > 0)) {
                 int32_t channelsEffectiveNum = 0;
                 int32_t channelsNum = 0;
                 if (br.numBitsLeft() < 32) {
-- 
cgit v1.1