Use ms_config_get_host_cnt() to fix DEREF_OF_NULL

Change-Id: I3e977e5f9ff34de2c141887c9c708b2eaba1d70e

diff --git a/packaging/mused.spec b/packaging/mused.spec
index 234793b..ba36e0e 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A multimedia daemon
-Version:    0.3.122
+Version:    0.3.123
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/server/src/muse_server.c b/server/src/muse_server.c
index efb001f..a387d0d 100644 (file)
--- a/server/src/muse_server.c
+++ b/server/src/muse_server.c
@@ -24,7 +24,7 @@
 void muse_server_set_dispatch_timeout(muse_module_h m, int api, int timeout)
 {
        muse_return_if_fail(m);
-       muse_return_if_fail(m->idx >= 0 && m->idx < ms_get_instance()->conf->host_cnt);
+       muse_return_if_fail(m->idx >= 0 && m->idx < ms_config_get_host_cnt());
        muse_return_if_fail(api >= 0 && api < MUSE_DISPATCHER_MAX);
 
        ms_module_set_timeout(m->idx, api, timeout);
@@ -34,7 +34,7 @@ int muse_server_get_dispatch_timeout(muse_module_h m, int api)
 {
        muse_return_val_if_fail(m, MM_ERROR_INVALID_ARGUMENT);
        muse_return_val_if_fail(m->pid > 0, MM_ERROR_INVALID_ARGUMENT);
-       muse_return_val_if_fail(m->idx >= 0 && m->idx < ms_get_instance()->conf->host_cnt, MM_ERROR_INVALID_ARGUMENT);
+       muse_return_val_if_fail(m->idx >= 0 && m->idx < ms_config_get_host_cnt(), MM_ERROR_INVALID_ARGUMENT);
        muse_return_val_if_fail(api >= 0 && api < MUSE_DISPATCHER_MAX, MM_ERROR_INVALID_ARGUMENT);
 
        return ms_module_get_timeout(m->idx, api);
@@ -46,7 +46,7 @@ int muse_server_module_set_value(muse_module_h m, const char *name, int value)
        muse_return_val_if_fail(m, MM_ERROR_INVALID_ARGUMENT);
        muse_return_val_if_fail(m->pid > 0, MM_ERROR_INVALID_ARGUMENT);
        muse_return_val_if_fail(name, MM_ERROR_INVALID_ARGUMENT);
-       muse_return_val_if_fail(m->idx >= 0 && m->idx < ms_get_instance()->conf->host_cnt, MM_ERROR_INVALID_ARGUMENT);
+       muse_return_val_if_fail(m->idx >= 0 && m->idx < ms_config_get_host_cnt(), MM_ERROR_INVALID_ARGUMENT);
 
        ms_module_set_dllsym_value(m->idx, name, GINT_TO_POINTER(value));
        return MM_ERROR_NONE;
@@ -61,7 +61,7 @@ int muse_server_module_get_value(muse_module_h m, const char *name, int *value)
        muse_return_val_if_fail(m->pid > 0, MM_ERROR_INVALID_ARGUMENT);
        muse_return_val_if_fail(name, MM_ERROR_INVALID_ARGUMENT);
        muse_return_val_if_fail(value, MM_ERROR_INVALID_ARGUMENT);
-       muse_return_val_if_fail(m->idx >= 0 && m->idx < ms_get_instance()->conf->host_cnt, MM_ERROR_INVALID_ARGUMENT);
+       muse_return_val_if_fail(m->idx >= 0 && m->idx < ms_config_get_host_cnt(), MM_ERROR_INVALID_ARGUMENT);
 
        ret = ms_module_get_dllsym_value(m->idx, name, &ptr);
        if (ret == MM_ERROR_NONE)