Check non-NULL before g_error_free()

It is added to avoid warning log inside of g_error_free().

[Version] 0.5.24
[Issue Type] Improvement

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

diff --git a/packaging/capi-media-sound-manager.spec b/packaging/capi-media-sound-manager.spec
index b1031bd..039cd1c 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.5.23
+Version:    0.5.24
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/sound_manager_private.c b/src/sound_manager_private.c
index caec215..6332bd6 100644 (file)
--- a/src/sound_manager_private.c
+++ b/src/sound_manager_private.c
@@ -334,11 +334,9 @@ static int __get_dbus_connection(GDBusConnection **conn)
        *conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &err);
        if (!(*conn) || err) {
                //LCOV_EXCL_START
+               LOGE("g_bus_get_sync() error (%s)", err ? err->message : NULL);
                if (err)
-                       LOGE("g_bus_get_sync() error (%s)", err->message);
-               else
-                       LOGE("g_bus_get_sync() error");
-               g_error_free(err);
+                       g_error_free(err);
                return MM_ERROR_SOUND_INTERNAL;
                //LCOV_EXCL_STOP
        }
@@ -884,7 +882,8 @@ int _get_stream_conf_info(const char *stream_type, stream_conf_info_s *info)
                                                        &err);
        if (!result || err) {
                LOGE("g_dbus_connection_call_sync() for GET_STREAM_INFO error (%s)", err ? err->message : NULL);
-               g_error_free(err);
+               if (err)
+                       g_error_free(err);
                ret = MM_ERROR_SOUND_INTERNAL;
                goto LEAVE;
        }
@@ -1040,7 +1039,8 @@ int _set_manual_route_info(unsigned int index, manual_route_info_s *info)
                                                        &err);
        if (!result || err) {
                LOGE("g_dbus_connection_call_sync() for SET_STREAM_ROUTE_DEVICES error (%s)", err ? err->message : NULL);
-               g_error_free(err);
+               if (err)
+                       g_error_free(err);
                ret = MM_ERROR_SOUND_INTERNAL;
                goto LEAVE;
        }
@@ -1091,7 +1091,8 @@ int _set_route_option(unsigned int index, const char *name, int value)
                                                        &err);
        if (!result || err) {
                LOGE("g_dbus_connection_call_sync() for SET_STREAM_ROUTE_OPTION error (%s)", err ? err->message : NULL);
-               g_error_free(err);
+               if (err)
+                       g_error_free(err);
                ret = MM_ERROR_SOUND_INTERNAL;
                goto LEAVE;
        }
@@ -1138,7 +1139,8 @@ int _get_volume_max_level(const char *direction, const char *volume_type, unsign
                                                        &err);
        if (!result || err) {
                LOGE("g_dbus_connection_call_sync() for GET_VOLUME_MAX_LEVEL error (%s)", err ? err->message : NULL);
-               g_error_free(err);
+               if (err)
+                       g_error_free(err);
                ret = MM_ERROR_SOUND_INTERNAL;
                goto LEAVE;
        }
@@ -1183,7 +1185,8 @@ int _get_volume_level(const char *direction, const char *volume_type, unsigned i
                                                        &err);
        if (!result || err) {
                LOGE("g_dbus_connection_call_sync() for GET_VOLUME_LEVEL error (%s)", err ? err->message : NULL);
-               g_error_free(err);
+               if (err)
+                       g_error_free(err);
                ret = MM_ERROR_SOUND_INTERNAL;
                goto LEAVE;
        }
@@ -1229,7 +1232,8 @@ int _set_volume_level(const char *direction, const char *volume_type, unsigned i
                                                        &err);
        if (!result || err) {
                LOGE("g_dbus_connection_call_sync() for SET_VOLUME_LEVEL error (%s)", err ? err->message : NULL);
-               g_error_free(err);
+               if (err)
+                       g_error_free(err);
                ret = MM_ERROR_SOUND_INTERNAL;
                goto LEAVE;
        }
@@ -1280,7 +1284,8 @@ int _get_current_volume_type(const char *direction, char **volume_type)
                                                        &err);
        if (!result || err) {
                LOGE("g_dbus_connection_call_sync() for GET_CURRENT_VOLUME_TYPE error (%s)", err ? err->message : NULL);
-               g_error_free(err);
+               if (err)
+                       g_error_free(err);
                ret = MM_ERROR_SOUND_INTERNAL;
                goto LEAVE;
        }
@@ -1331,7 +1336,8 @@ int _get_current_media_routing_path(const char *direction, sound_device_type_e *
                                                        &err);
        if (!result || err) {
                LOGE("g_dbus_connection_call_sync() for GET_CURRENT_MEDIA_ROUTING_PATH error (%s)", err ? err->message : NULL);
-               g_error_free(err);
+               if (err)
+                       g_error_free(err);
                ret = MM_ERROR_SOUND_INTERNAL;
                goto LEAVE;
        }
@@ -1379,7 +1385,8 @@ void _update_focus_status(unsigned int index, unsigned int acquired_focus_status
                                                        &err);
        if (!result || err) {
                LOGE("g_dbus_connection_call_sync() for UPDATE_FOCUS_STATUS error (%s)", err ? err->message : NULL);
-               g_error_free(err);
+               if (err)
+                       g_error_free(err);
                goto LEAVE;
        }
        g_variant_get(result, "(&s)", &dbus_ret);
@@ -1470,7 +1477,8 @@ int _get_supported_sample_formats(int device_id, sound_sample_format_e **formats
        if (!result || err) {
                LOGE("g_dbus_connection_call_sync() for GET_SUPPORTED_SAMPLE_FORMATS error (%s)", err ? err->message : NULL);
                ret = _convert_dbus_error(err ? err->message : NULL);
-               g_error_free(err);
+               if (err)
+                       g_error_free(err);
                goto LEAVE;
        }
 
@@ -1576,7 +1584,8 @@ int _get_sample_format(int device_id, sound_sample_format_e *format)
        if (!result || err) {
                LOGE("g_dbus_connection_call_sync() for GET_SAMPLE_FORMAT error (%s)", err ? err->message : NULL);
                ret = _convert_dbus_error(err ? err->message : NULL);
-               g_error_free(err);
+               if (err)
+                       g_error_free(err);
                goto LEAVE;
        }
        g_variant_get(result, "(&s)", &format_str);
@@ -1627,7 +1636,8 @@ int _get_supported_sample_rates(int device_id, sound_sample_rate_e **rates, unsi
        if (!result || err) {
                LOGE("g_dbus_connection_call_sync() for GET_SUPPORTED_SAMPLE_RATES error (%s)", err ? err->message : NULL);
                ret = _convert_dbus_error(err ? err->message : NULL);
-               g_error_free(err);
+               if (err)
+                       g_error_free(err);
                goto LEAVE;
        }
 
@@ -1733,7 +1743,8 @@ int _get_sample_rate(int device_id, sound_sample_rate_e *rate)
        if (!result || err) {
                LOGE("g_dbus_connection_call_sync() for GET_SAMPLE_RATE error (%s)", err ? err->message : NULL);
                ret = _convert_dbus_error(err ? err->message : NULL);
-               g_error_free(err);
+               if (err)
+                       g_error_free(err);
                goto LEAVE;
        }
        g_variant_get(result, "(u)", &_rate);
@@ -1808,7 +1819,8 @@ int _get_avoid_resampling(int device_id, bool *enabled)
        if (!result || err) {
                LOGE("g_dbus_connection_call_sync() for GET_AVOID_RESAMPLING error (%s)", err ? err->message : NULL);
                ret = _convert_dbus_error(err ? err->message : NULL);
-               g_error_free(err);
+               if (err)
+                       g_error_free(err);
                goto LEAVE;
        }
 
@@ -1886,7 +1898,8 @@ int _get_media_stream_only(int device_id, bool *enabled)
        if (!result || err) {
                LOGE("g_dbus_connection_call_sync() for GET_SPECIFIED_STREAM error (%s)", err ? err->message : NULL);
                ret = _convert_dbus_error(err ? err->message : NULL);
-               g_error_free(err);
+               if (err)
+                       g_error_free(err);
                goto LEAVE;
        }
 
@@ -2566,7 +2579,8 @@ int _set_volume_ratio(uint32_t stream_index, sound_stream_direction_e direction,
        if (!result || err) {
                LOGE("g_dbus_connection_call_sync() for SET_VOLUME_RATIO error (%s)", err ? err->message : NULL);
                ret = _convert_dbus_error(err ? err->message : NULL);
-               g_error_free(err);
+               if (err)
+                       g_error_free(err);
                goto LEAVE;
        }
        g_variant_get(result, "(&s)", &dbus_ret);