commit ca655c345f01e6ed786cfcfc3fa2cb574b758680
author Ben Romberger <bromberg@codeaurora.org> Tue Jan 29 21:41:27 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 29 21:41:27 2019 -0800
tree 93b49334fb82acd2653d39db815250e80f0f6d28
parent c1321ce35b340c9a3f53227762b349dcda177f8a
parent c6a37161e15d1e22af5a992c6c6e765bbdf5dc82

Merge "libmediaplayerservice: Check for a possible divide by 0" am: caa0b29253
am: c6a37161e1

Change-Id: Ie2e7119611734e72d6982c4f709e6bace9357085

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 9bcfc83..96f79e0 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1906,10 +1906,16 @@
         if (AudioSystem::getOutputSamplingRate(&afSampleRate, mStreamType) != NO_ERROR) {
             return NO_INIT;
         }
+        if (afSampleRate == 0) {
+            return NO_INIT;
+        }
         const size_t framesPerBuffer =
                 (unsigned long long)sampleRate * afFrameCount / afSampleRate;
 
         if (bufferCount == 0) {
+            if (framesPerBuffer == 0) {
+                return NO_INIT;
+            }
             // use suggestedFrameCount
             bufferCount = (suggestedFrameCount + framesPerBuffer - 1) / framesPerBuffer;
         }