diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-11-07 15:59:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-07 15:59:46 +0000 |
| commit | b4b0608b0560a7cad27aeec0af8b1728b971aa3a (patch) | |
| tree | 4f44622f9eeafd173c5a0d697f29a735c733c495 /audio | |
| parent | 69f48b86d78ac8968ccafc6287eed3079f1cb56e (diff) | |
| parent | 2d2ea50df16fc1a04f1ebf8772c65c56e4f5ecfa (diff) | |
| download | hardware_libhardware_legacy-b4b0608b0560a7cad27aeec0af8b1728b971aa3a.zip hardware_libhardware_legacy-b4b0608b0560a7cad27aeec0af8b1728b971aa3a.tar.gz hardware_libhardware_legacy-b4b0608b0560a7cad27aeec0af8b1728b971aa3a.tar.bz2 | |
Merge "legacy audio policy: check string parameters before use" into lmp-mr1-dev
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index 1d49abb..c03224a 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -53,6 +53,11 @@ status_t AudioPolicyManagerBase::setDeviceConnectionState(audio_devices_t device AudioSystem::device_connection_state state, const char *device_address) { + // device_address can be NULL and should be handled as an empty string in this case, + // and it is not checked by AudioPolicyInterfaceImpl.cpp + if (device_address == NULL) { + device_address = ""; + } ALOGV("setDeviceConnectionState() device: 0x%X, state %d, address %s", device, state, device_address); // connect/disconnect only 1 device at a time @@ -245,6 +250,10 @@ status_t AudioPolicyManagerBase::setDeviceConnectionState(audio_devices_t device AudioSystem::device_connection_state AudioPolicyManagerBase::getDeviceConnectionState(audio_devices_t device, const char *device_address) { + // similar to setDeviceConnectionState + if (device_address == NULL) { + device_address = ""; + } AudioSystem::device_connection_state state = AudioSystem::DEVICE_STATE_UNAVAILABLE; String8 address = String8(device_address); if (audio_is_output_device(device)) { |