stream-manager-volume: Fix for iniparser upgrade

iniparser_getstring() will returns 'const char *' type

[Version] 11.1.93
[Issue Type] Update

Change-Id: If7f243f770c26c524ae00aa3c84af97cdcc6f77e

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index 7db8497..ce666c8 100644 (file)
--- a/packaging/pulseaudio-modules-tizen.spec
+++ b/packaging/pulseaudio-modules-tizen.spec
@@ -1,6 +1,6 @@
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          11.1.92
+Version:          11.1.93
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+

diff --git a/src/stream-manager-volume.c b/src/stream-manager-volume.c
index 073adf6..470c325 100644 (file)
--- a/src/stream-manager-volume.c
+++ b/src/stream-manager-volume.c
@@ -81,6 +81,7 @@ static int load_out_volume_conf_file(pa_stream_manager *m) {
     char *list_str = NULL;
     char *token = NULL;
     char *ptr = NULL;
+    const char *gain_str = NULL;
     const char *table_str = DEFAULT_TABLE;
     volume_info* v = NULL;
     void *state = NULL;
@@ -105,7 +106,7 @@ static int load_out_volume_conf_file(pa_stream_manager *m) {
         key = pa_xmalloc0(size);
         if (key) {
             snprintf(key, size, "%s:%s", table_str, vol_type_str);
-            list_str = iniparser_getstring(dict, key, NULL);
+            list_str = pa_xstrdup(iniparser_getstring(dict, key, NULL));
             if (list_str) {
                 token = strtok_r(list_str, delimiter, &ptr);
                 while (token) {
@@ -119,6 +120,7 @@ static int load_out_volume_conf_file(pa_stream_manager *m) {
                     pa_idxset_put(v->values[STREAM_DIRECTION_OUT].idx_volume_values, vol_value, NULL);
                     token = strtok_r(NULL, delimiter, &ptr);
                 }
+                pa_xfree(list_str);
             } else {
                 pa_log_warn("[%s] is not defined, skip it", key);
             }
@@ -137,10 +139,10 @@ static int load_out_volume_conf_file(pa_stream_manager *m) {
         key = pa_xmalloc0(size);
         if (key) {
             snprintf(key, size, "%s:gain_%s", table_str, gain_type_str);
-            token = iniparser_getstring(dict, key, NULL);
-            if (token) {
+            gain_str = iniparser_getstring(dict, key, NULL);
+            if (gain_str) {
                 double *modifier_gain = pa_xmalloc0(sizeof(double));
-                *modifier_gain = atof(token);
+                *modifier_gain = atof(gain_str);
                 if (!m->volume_modifiers)
                     m->volume_modifiers = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
                 pa_hashmap_put(m->volume_modifiers, (void*)gain_type_str, modifier_gain);