Check media_type parameter

[Version] 0.4.65
[Issue Type] Coverity defects

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

diff --git a/packaging/capi-media-webrtc.spec b/packaging/capi-media-webrtc.spec
index b227056f9a10cc23f2a88ff306264c3755f0a82b..e49722912f199561447d86e612eb82d02cf5379b 100644 (file)
--- a/packaging/capi-media-webrtc.spec
+++ b/packaging/capi-media-webrtc.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-webrtc
 Summary:    A WebRTC library in Tizen Native API
-Version:    0.4.64
+Version:    0.4.65
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/webrtc.c b/src/webrtc.c
index a60bd681c820a425e4dce385f72ad863006c9505..9544a24c34f1565fe0704f483deab050a47b5258 100644 (file)
--- a/src/webrtc.c
+++ b/src/webrtc.c
@@ -373,6 +373,7 @@ int webrtc_media_source_set_transceiver_direction(webrtc_h webrtc, unsigned int
        webrtc_s *_webrtc = (webrtc_s *)webrtc;
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);
 
@@ -387,6 +388,7 @@ int webrtc_media_source_get_transceiver_direction(webrtc_h webrtc, unsigned int
        webrtc_s *_webrtc = (webrtc_s *)webrtc;
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
        RET_VAL_IF(direction == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "direction is NULL");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);
@@ -400,6 +402,7 @@ int webrtc_media_source_foreach_supported_transceiver_codec(webrtc_h webrtc, web
        webrtc_s *_webrtc = (webrtc_s *)webrtc;
 
        RET_VAL_IF(webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
        RET_VAL_IF(callback == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "callback is NULL");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);
@@ -413,6 +416,7 @@ int webrtc_media_source_set_transceiver_codec(webrtc_h webrtc, unsigned int sour
        webrtc_s *_webrtc = (webrtc_s *)webrtc;
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);
 
@@ -427,6 +431,7 @@ int webrtc_media_source_get_transceiver_codec(webrtc_h webrtc, unsigned int sour
        webrtc_s *_webrtc = (webrtc_s *)webrtc;
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
        RET_VAL_IF(codec == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "codec is NULL");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);
@@ -440,6 +445,7 @@ int webrtc_media_source_set_pause(webrtc_h webrtc, unsigned int source_id, webrt
        webrtc_s *_webrtc = (webrtc_s *)webrtc;
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);
 
@@ -452,6 +458,7 @@ int webrtc_media_source_get_pause(webrtc_h webrtc, unsigned int source_id, webrt
        webrtc_s *_webrtc = (webrtc_s *)webrtc;
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
        RET_VAL_IF(paused == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "paused is NULL");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);
@@ -465,8 +472,7 @@ int webrtc_media_source_set_mute(webrtc_h webrtc, unsigned int source_id, webrtc
        webrtc_s *_webrtc = (webrtc_s *)webrtc;
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
-       RET_VAL_IF(media_type != WEBRTC_MEDIA_TYPE_AUDIO && media_type != WEBRTC_MEDIA_TYPE_VIDEO,
-               WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type(%d)", media_type);
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);
 
@@ -481,8 +487,7 @@ int webrtc_media_source_get_mute(webrtc_h webrtc, unsigned int source_id, webrtc
        webrtc_s *_webrtc = (webrtc_s *)webrtc;
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
-       RET_VAL_IF(media_type != WEBRTC_MEDIA_TYPE_AUDIO && media_type != WEBRTC_MEDIA_TYPE_VIDEO,
-               WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type(%d)", media_type);
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
        RET_VAL_IF(muted == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "muted is NULL");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);
@@ -498,6 +503,7 @@ int webrtc_media_source_set_encoder_bitrate(webrtc_h webrtc, unsigned int source
        webrtc_s *_webrtc = (webrtc_s *)webrtc;
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);
 
@@ -510,6 +516,7 @@ int webrtc_media_source_get_encoder_bitrate(webrtc_h webrtc, unsigned int source
        webrtc_s *_webrtc = (webrtc_s *)webrtc;
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);
 

diff --git a/src/webrtc_internal.c b/src/webrtc_internal.c
index e21b21d114c91eb5095c9d435bb077eb8076d113..24c74d6c5eaa89a3e8ed8418fb9964e06c5e5b50 100644 (file)
--- a/src/webrtc_internal.c
+++ b/src/webrtc_internal.c
@@ -233,6 +233,7 @@ int webrtc_media_source_add_transceiver_encoding(webrtc_h webrtc, unsigned int s
        webrtc_s *_webrtc = (webrtc_s *)webrtc;
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
        RET_VAL_IF(rid == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "rid is NULL");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);
@@ -248,6 +249,7 @@ int webrtc_media_source_remove_transceiver_encoding(webrtc_h webrtc, unsigned in
        webrtc_s *_webrtc = (webrtc_s *)webrtc;
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
        RET_VAL_IF(rid == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "rid is NULL");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);
@@ -263,6 +265,7 @@ int webrtc_media_source_active_transceiver_encoding(webrtc_h webrtc, unsigned in
        webrtc_s *_webrtc = (webrtc_s *)webrtc;
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
        RET_VAL_IF(rid == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "rid is NULL");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);
@@ -277,6 +280,7 @@ int webrtc_media_source_get_transceiver_mid(webrtc_h webrtc, unsigned int source
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
        RET_VAL_IF(source_id == 0, WEBRTC_ERROR_INVALID_PARAMETER, "source_id is 0");
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
        RET_VAL_IF(mid == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "mid is NULL");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);
@@ -291,6 +295,7 @@ int webrtc_media_source_set_transceiver_recv_drop(webrtc_h webrtc, unsigned int
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
        RET_VAL_IF(source_id == 0, WEBRTC_ERROR_INVALID_PARAMETER, "source_id is 0");
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);
 
@@ -304,6 +309,7 @@ int webrtc_media_source_get_transceiver_recv_drop(webrtc_h webrtc, unsigned int
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
        RET_VAL_IF(source_id == 0, WEBRTC_ERROR_INVALID_PARAMETER, "source_id is 0");
+       RET_VAL_IF(media_type > WEBRTC_MEDIA_TYPE_VIDEO, WEBRTC_ERROR_INVALID_PARAMETER, "invalid media_type");
        RET_VAL_IF(dropped == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "dropped is NULL");
 
        locker = g_mutex_locker_new(&_webrtc->mutex);