fixup! fixup! Add mutex to stream_info structure for virtual stream APIs

Fix of DEREF_AFTER_FREE.EX svace issue

[Version] 0.6.16
[Issue Type] Bug fix

Change-Id: I7205eac409bd1295a70e4f07bd7d69f9cf25a9ad

diff --git a/packaging/capi-media-sound-manager.spec b/packaging/capi-media-sound-manager.spec
index d18c46d..3aba308 100644 (file)
--- a/packaging/capi-media-sound-manager.spec
+++ b/packaging/capi-media-sound-manager.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-sound-manager
 Summary:    Sound Manager library
-Version:    0.6.15
+Version:    0.6.16
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/sound_manager_internal.c b/src/sound_manager_internal.c
index e90ef51..336b083 100644 (file)
--- a/src/sound_manager_internal.c
+++ b/src/sound_manager_internal.c
@@ -452,7 +452,6 @@ int sound_manager_destroy_virtual_stream(virtual_sound_stream_h virtual_stream)
        SM_ENTER_CRITICAL_SECTION_WITH_RETURN(vstream_mutex, SOUND_MANAGER_ERROR_INTERNAL);
 
        ret = _destroy_virtual_stream(vstream_h);
-       vstream_h->stream_info->vstream = NULL;
 
        SM_LEAVE_CRITICAL_SECTION(vstream_mutex);
 

diff --git a/src/sound_manager_private.c b/src/sound_manager_private.c
index 79aaf50..741b144 100644 (file)
--- a/src/sound_manager_private.c
+++ b/src/sound_manager_private.c
@@ -2635,6 +2635,8 @@ int _destroy_virtual_stream(virtual_sound_stream_info_s *virtual_stream)
        if (virtual_stream->pa_proplist)
                pa_proplist_free(virtual_stream->pa_proplist);
 
+       virtual_stream->stream_info->vstream = NULL;
+
        SM_SAFE_FREE(virtual_stream);
 
        return ret;