commit bcd048aea24a7781de591c5536c8823ed5a842fe
author rago <rago@google.com> Thu Oct 13 01:27:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 13 01:27:23 2016 +0000
tree 2269ad538196eeb72e75d5a9dc3193f1a4a9f184
parent 38dcbab6b3b1efb2a953db3b8394a78875a7510c
parent 18b2de20a702c70add01e46a9cd631b3fe9a5ce1

Fix potential NULL dereference in Visualizer effect am: 0c39abc483
am: 18b2de20a7

Change-Id: I131f617ee43a13dc8d50a1aa03eb10076db9f0b5

visualizer/offload_visualizer.c

diff --git a/visualizer/offload_visualizer.c b/visualizer/offload_visualizer.c
index 2d92267..6f03711 100644
--- a/visualizer/offload_visualizer.c
+++ b/visualizer/offload_visualizer.c
@@ -1243,11 +1243,11 @@
 
 __attribute__ ((visibility ("default")))
 audio_effect_library_t AUDIO_EFFECT_LIBRARY_INFO_SYM = {
-    tag : AUDIO_EFFECT_LIBRARY_TAG,
-    version : EFFECT_LIBRARY_API_VERSION,
-    name : "Visualizer Library",
-    implementor : "The Android Open Source Project",
-    create_effect : effect_lib_create,
-    release_effect : effect_lib_release,
-    get_descriptor : effect_lib_get_descriptor,
+    .tag = AUDIO_EFFECT_LIBRARY_TAG,
+    .version = EFFECT_LIBRARY_API_VERSION,
+    .name = "Visualizer Library",
+    .implementor = "The Android Open Source Project",
+    .create_effect = effect_lib_create,
+    .release_effect = effect_lib_release,
+    .get_descriptor = effect_lib_get_descriptor,
 };

voice_processing/voice_processing.c

diff --git a/voice_processing/voice_processing.c b/voice_processing/voice_processing.c
index 9543f96..e556333 100644
--- a/voice_processing/voice_processing.c
+++ b/voice_processing/voice_processing.c
@@ -749,11 +749,11 @@
 // This is the only symbol that needs to be exported
 __attribute__ ((visibility ("default")))
 audio_effect_library_t AUDIO_EFFECT_LIBRARY_INFO_SYM = {
-    tag : AUDIO_EFFECT_LIBRARY_TAG,
-    version : EFFECT_LIBRARY_API_VERSION,
-    name : "MSM8960 Audio Preprocessing Library",
-    implementor : "The Android Open Source Project",
-    create_effect : lib_create,
-    release_effect : lib_release,
-    get_descriptor : lib_get_descriptor
+    .tag = AUDIO_EFFECT_LIBRARY_TAG,
+    .version = EFFECT_LIBRARY_API_VERSION,
+    .name = "MSM8960 Audio Preprocessing Library",
+    .implementor = "The Android Open Source Project",
+    .create_effect = lib_create,
+    .release_effect = lib_release,
+    .get_descriptor = lib_get_descriptor
 };