Fix SVACE defects

[Version] 0.10.109
[Profile] Common
[Issue Type] Security

Change-Id: I7d16be3762d2cb156c627c4efa1c3c7dea12ed9f

diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec
index 781301e..e0d8d1d 100644 (file)
--- a/packaging/libmm-sound.spec
+++ b/packaging/libmm-sound.spec
@@ -1,6 +1,6 @@
 Name:       libmm-sound
 Summary:    MMSound Package contains client lib and sound_server binary
-Version:    0.10.108
+Version:    0.10.109
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/server/mm_sound_mgr_codec.c b/server/mm_sound_mgr_codec.c
index e33b8be..e057f86 100644 (file)
--- a/server/mm_sound_mgr_codec.c
+++ b/server/mm_sound_mgr_codec.c
@@ -593,12 +593,11 @@ int MMSoundMgrCodecPlayDtmf(int *slotid, const mmsound_mgr_codec_param_t *param)
 #ifdef DEBUG_DETAIL
        debug_enter();
 #endif
-
-       for (plugin_id = 0; g_plugins[plugin_id].GetSupportTypes; plugin_id++) {
-               /* Find codec */
-               codec_type = g_plugins[plugin_id].GetSupportTypes();
-               if (codec_type && (MM_SOUND_SUPPORTED_CODEC_DTMF == codec_type[0]))
-                       break;
+       plugin_id = _MMSoundMgrCodecFindCodecPluginID(MM_SOUND_SUPPORTED_CODEC_DTMF);
+       if (plugin_id == -1) {
+               debug_error("Could not find proper codec plugin!!!");
+               err = MM_ERROR_SOUND_INTERNAL;
+               goto cleanup;
        }
 
        /*The count num means codec type DTMF */
@@ -777,12 +776,11 @@ int MMSoundMgrCodecPlayDtmfWithStreamInfo(int *slotid, const mmsound_mgr_codec_p
 #ifdef DEBUG_DETAIL
        debug_enter();
 #endif
-
-       for (plugin_id = 0; g_plugins[plugin_id].GetSupportTypes; plugin_id++) {
-               /* Find codec */
-               codec_type = g_plugins[plugin_id].GetSupportTypes();
-               if (codec_type && (MM_SOUND_SUPPORTED_CODEC_DTMF == codec_type[0]))
-                       break;
+       plugin_id = _MMSoundMgrCodecFindCodecPluginID(MM_SOUND_SUPPORTED_CODEC_DTMF);
+       if (plugin_id == -1) {
+               debug_error("Could not find proper codec plugin!!!");
+               err = MM_ERROR_SOUND_INTERNAL;
+               goto cleanup;
        }
 
        /*The count num means codec type DTMF */

diff --git a/server/plugin/wav/mm_sound_plugin_codec_wave.c b/server/plugin/wav/mm_sound_plugin_codec_wave.c
index 4bda9a9..e4e17d8 100644 (file)
--- a/server/plugin/wav/mm_sound_plugin_codec_wave.c
+++ b/server/plugin/wav/mm_sound_plugin_codec_wave.c
@@ -317,8 +317,7 @@ static int _pa_stream_connect(wave_info_t *h)
        proplist = pa_proplist_new();
        if (!proplist)
                return -1;
-       if (h->stream_type)
-               pa_proplist_sets(proplist, PA_PROP_MEDIA_ROLE, h->stream_type);
+       pa_proplist_sets(proplist, PA_PROP_MEDIA_ROLE, h->stream_type);
        if (h->stream_index != -1)
                pa_proplist_setf(proplist, PA_PROP_MEDIA_PARENT_ID, "%d", h->stream_index);