mm_sound_server: Terminate the server when MMSoundThreadPoolRun() is failed

[Version] 0.12.51
[Issue Type] Crash

Change-Id: Ia58555507d775426dd1b4633e296f57c4635af2f
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec
index 1f0193b..3523166 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.12.50
+Version:    0.12.51
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/server/mm_sound_plugin.c b/server/mm_sound_plugin.c
index e56ec80..92c3799 100644 (file)
--- a/server/mm_sound_plugin.c
+++ b/server/mm_sound_plugin.c
@@ -87,6 +87,9 @@ int MMSoundPluginRelease(MMSoundPluginType *pluginlist)
 
        debug_fenter();
 
+       if (!pluginlist)
+               return MM_ERROR_NONE;
+
        while (pluginlist[loop].type != MM_SOUND_PLUGIN_TYPE_NONE)
                MMSoundPluginClose(&pluginlist[loop++]);
 

diff --git a/server/mm_sound_server.c b/server/mm_sound_server.c
index 6a7a01f..f7aeb08 100644 (file)
--- a/server/mm_sound_server.c
+++ b/server/mm_sound_server.c
@@ -217,7 +217,10 @@ int main(int argc, char **argv)
 
        if (serveropt.startserver || serveropt.printlist) {
                MMSoundMgrDbusInit();
-               MMSoundThreadPoolInit();
+               if (MMSoundThreadPoolInit()) {
+                       debug_error("failed to MMSoundThreadPoolInit()");
+                       goto exit;
+               }
                MMSoundMgrCodecInit(serveropt.plugdir, _shutdown_cb);
        }
 
@@ -228,6 +231,7 @@ int main(int argc, char **argv)
                _mainloop_run();
        }
 
+exit:
        debug_warning("sound_server [%d] terminating ", getpid());
 
        if (serveropt.startserver || serveropt.printlist) {

diff --git a/server/mm_sound_thread_pool.c b/server/mm_sound_thread_pool.c
index 9525a0b..0ddc346 100644 (file)
--- a/server/mm_sound_thread_pool.c
+++ b/server/mm_sound_thread_pool.c
@@ -112,7 +112,8 @@ int MMSoundThreadPoolInit()
                his dummy thread will be remained unused as soon as it started */
        debug_msg("run threads to reserve minimum thread");
        for (i = 0; i < MAX_UNUSED_THREADS_IN_THREADPOOL; i++)
-               MMSoundThreadPoolRun((void *)i, __DummyWork);
+               if (MMSoundThreadPoolRun((void *)i, __DummyWork))
+                       return MM_ERROR_SOUND_INTERNAL;
 
        MMSoundThreadPoolDump(TRUE);