commit 32268b2086ed779c4aee1d09e590b3577a628ed9
author Nick Kralevich <nnk@google.com> Thu Apr 23 19:50:18 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 23 19:50:18 2015 +0000
tree 2e0ac23518fc3a8f680db61267126eddf0a55328
parent 41fec5413e6e939ed3275ec932a63fd235571d49
parent a05bd3c1cdff400ad92532b06d40ddc5c638c284

am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev

* commit 'a05bd3c1cdff400ad92532b06d40ddc5c638c284':
  Fix integer underflow in ESDS processing

media/libmedia/IAudioPolicyService.cpp

diff --git a/media/libmedia/IAudioPolicyService.cpp b/media/libmedia/IAudioPolicyService.cpp
index 12efa8a..70551c4 100644
--- a/media/libmedia/IAudioPolicyService.cpp
+++ b/media/libmedia/IAudioPolicyService.cpp
@@ -73,8 +73,6 @@
     REGISTER_POLICY_MIXES,
 };
 
-#define MAX_ITEMS_PER_LIST 1024
-
 class BpAudioPolicyService : public BpInterface<IAudioPolicyService>
 {
 public:
@@ -1056,18 +1054,10 @@
             audio_port_role_t role = (audio_port_role_t)data.readInt32();
             audio_port_type_t type = (audio_port_type_t)data.readInt32();
             unsigned int numPortsReq = data.readInt32();
-            if (numPortsReq > MAX_ITEMS_PER_LIST) {
-                numPortsReq = MAX_ITEMS_PER_LIST;
-            }
             unsigned int numPorts = numPortsReq;
+            unsigned int generation;
             struct audio_port *ports =
                     (struct audio_port *)calloc(numPortsReq, sizeof(struct audio_port));
-            if (ports == NULL) {
-                reply->writeInt32(NO_MEMORY);
-                reply->writeInt32(0);
-                return NO_ERROR;
-            }
-            unsigned int generation;
             status_t status = listAudioPorts(role, type, &numPorts, ports, &generation);
             reply->writeInt32(status);
             reply->writeInt32(numPorts);
@@ -1121,19 +1111,11 @@
         case LIST_AUDIO_PATCHES: {
             CHECK_INTERFACE(IAudioPolicyService, data, reply);
             unsigned int numPatchesReq = data.readInt32();
-            if (numPatchesReq > MAX_ITEMS_PER_LIST) {
-                numPatchesReq = MAX_ITEMS_PER_LIST;
-            }
             unsigned int numPatches = numPatchesReq;
+            unsigned int generation;
             struct audio_patch *patches =
                     (struct audio_patch *)calloc(numPatchesReq,
                                                  sizeof(struct audio_patch));
-            if (patches == NULL) {
-                reply->writeInt32(NO_MEMORY);
-                reply->writeInt32(0);
-                return NO_ERROR;
-            }
-            unsigned int generation;
             status_t status = listAudioPatches(&numPatches, patches, &generation);
             reply->writeInt32(status);
             reply->writeInt32(numPatches);