OSDN Git Service

Track: Check buffer size of static tracks
authorAndy Hung <hunga@google.com>
Tue, 13 Jun 2017 00:22:46 +0000 (17:22 -0700)
committerAndy Hung <hunga@google.com>
Fri, 16 Jun 2017 01:10:10 +0000 (18:10 -0700)
Merged-In: Ia7edd9a802905214a27961dbcec6352f6ef98f73
Merged-In: I633caf563d3607dbe4b9be10be1687efce33469c
Test: Native POC
Bug: 38340117
Change-Id: I633caf563d3607dbe4b9be10be1687efce33469c

services/audioflinger/Tracks.cpp

index d1bcb0b..bb220c5 100644 (file)
@@ -367,6 +367,21 @@ AudioFlinger::PlaybackThread::Track::Track(
             mAudioTrackServerProxy = new AudioTrackServerProxy(mCblk, mBuffer, frameCount,
                     mFrameSize);
         } else {
+            // Is the shared buffer of sufficient size?
+            // (frameCount * mFrameSize) is <= SIZE_MAX, checked in TrackBase.
+            if (sharedBuffer->size() < frameCount * mFrameSize) {
+                // Workaround: clear out mCblk to indicate track hasn't been properly created.
+                mCblk->~audio_track_cblk_t();   // destroy our shared-structure.
+                if (mClient == 0) {
+                    free(mCblk);
+                }
+                mCblk = NULL;
+
+                mSharedBuffer.clear(); // release shared buffer early
+                android_errorWriteLog(0x534e4554, "38340117");
+                return;
+            }
+
             mAudioTrackServerProxy = new StaticAudioTrackServerProxy(mCblk, mBuffer, frameCount,
                     mFrameSize);
         }