Fix memory leak

[platform/core/api/media-content.git] / src / media_filter.c

diff --git a/src/media_filter.c b/src/media_filter.c
index e1fd76f..049c920 100755 (executable)
--- a/src/media_filter.c
+++ b/src/media_filter.c
@@ -140,7 +140,11 @@ int _media_filter_build_option(filter_h filter, char **result)
                        _filter->offset,
                        _filter->count);
        } else {
+#ifdef _USE_TVPD_MODE
                *result = g_strdup_printf("%s LIMIT %d, %d", _filter->order_keyword, _filter->offset, _filter->count);
+#else
+               *result = g_strdup_printf("ORDER BY %s LIMIT %d, %d", _filter->order_keyword, _filter->offset, _filter->count);
+#endif
        }
 
        return MEDIA_CONTENT_ERROR_NONE;
@@ -208,16 +212,7 @@ int media_filter_set_condition(filter_h filter, const char *condition, media_con
        _filter->is_full_condition = false;
        g_free(_filter->condition);
 
-       _filter->condition = _media_content_replace_path_in_condition(condition);
-
-       /* FIXME
-               If an error is occured in _media_content_replace_path_in_condition(),
-               A suitable return value is 'MEDIA_CONTENT_ERROR_INVALID_OPERATION'.
-               However, it is not stated in the description of media_filter_set_condition().
-               Therefore, use 'MEDIA_CONTENT_ERROR_OUT_OF_MEMORY' temporarily.
-               It will be modified after removing _media_content_replace_path_in_condition() function.
-       */
-       content_retvm_if(_filter->condition == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "Fail to set condition");
+       _filter->condition = g_strdup(condition);
 
        content_sec_debug("Condition string : %s", _filter->condition);
 
@@ -334,15 +329,7 @@ int media_filter_set_condition_v2(filter_h filter, const char *condition)
 
        g_free(_filter->condition);
 
-       /* FIXME
-               If an error is occured in _media_content_replace_path_in_condition(),
-               A suitable return value is 'MEDIA_CONTENT_ERROR_INVALID_OPERATION'.
-               However, it is not stated in the description of media_filter_set_condition().
-               Therefore, use 'MEDIA_CONTENT_ERROR_OUT_OF_MEMORY' temporarily.
-               It will be modified after removing _media_content_replace_path_in_condition() function.
-       */
-       _filter->condition = _media_content_replace_path_in_condition(condition);
-       content_retvm_if(_filter->condition == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "Fail to set condition");
+       _filter->condition = g_strdup(condition);
 
        content_sec_debug("Condition string : %s", _filter->condition);