Check media_type parameter

[Version] 1.1.32
[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 1f15aa8e3b11686223ece60d00c158fd8bc511d7..d3b90614ae849017081c4106ac746f3554507377 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:    1.1.31
+Version:    1.1.32
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/webrtc.c b/src/webrtc.c
index c72561e07992daf386af3957731bbd737c24364b..cc0206ab4f92bd4c04b5e1acdc6354706d63ac6a 100644 (file)
--- a/src/webrtc.c
+++ b/src/webrtc.c
@@ -419,6 +419,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);
 
@@ -431,6 +432,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);
@@ -444,6 +446,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);
@@ -457,6 +460,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);
 
@@ -469,6 +473,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);
@@ -509,6 +514,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);
 
@@ -521,6 +527,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);
@@ -534,8 +541,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);
 
@@ -550,8 +556,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);
@@ -567,6 +572,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);
 
@@ -579,6 +585,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 c0b3a8ea94af7912f054f07ae4f5114ba44af82f..4f3278fc097265c54955cf380afa72c3a8df65de 100644 (file)
--- a/src/webrtc_internal.c
+++ b/src/webrtc_internal.c
@@ -150,6 +150,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);
@@ -163,6 +164,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);
@@ -176,6 +178,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);
@@ -190,6 +193,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);
@@ -204,6 +208,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);
 
@@ -217,6 +222,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);
@@ -272,6 +278,7 @@ int webrtc_null_source_set_media_type(webrtc_h webrtc, unsigned int source_id, w
 
        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);