commit 8282bb49536839320b0511c95ef18bc80da19916
author Pawan Wagh <waghpawan@google.com> Wed Jul 05 23:01:17 2023 +0000
committer Pawan Wagh <waghpawan@google.com> Tue Jul 11 08:32:09 2023 +0000
tree 259257a2fecdbbb92a0252fc4c2f14b175a9ef73
parent 2410aa74d1904679642ba63666dcec248eed9c1b

Check for null params in VolumeShaper

Test: m media_player_service_fuzzer && adb sync data && adb shell /data/fuzz/arm64/media_player_service_fuzzer/media_player_service_fuzzer
Bug: 289674996
Change-Id: I3f31abc324914725f106fbdbab65922c741bf980

include/media/VolumeShaper.h

diff --git a/include/media/VolumeShaper.h b/include/media/VolumeShaper.h
index 5271e10..6208db3 100644
--- a/include/media/VolumeShaper.h
+++ b/include/media/VolumeShaper.h
@@ -1099,7 +1099,7 @@
      * internal to the VolumeHandler.
      */
     void setIdIfNecessary(const sp<VolumeShaper::Configuration> &configuration) {
-        if (configuration->getType() == VolumeShaper::Configuration::TYPE_SCALE) {
+        if (configuration && configuration->getType() == VolumeShaper::Configuration::TYPE_SCALE) {
             const int id = configuration->getId();
             if (id == -1) {
                 // Reassign to a unique id, skipping system ids.

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 075c385..c08da0f 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -2611,6 +2611,16 @@
     Mutex::Autolock lock(mLock);
     ALOGV("AudioOutput::applyVolumeShaper");
 
+    if (configuration == nullptr) {
+        ALOGE("AudioOutput::applyVolumeShaper Null configuration parameter");
+        return VolumeShaper::Status(BAD_VALUE);
+    }
+
+    if (operation == nullptr) {
+        ALOGE("AudioOutput::applyVolumeShaper Null operation parameter");
+        return VolumeShaper::Status(BAD_VALUE);
+    }
+
     mVolumeHandler->setIdIfNecessary(configuration);
 
     VolumeShaper::Status status;