webrtc : check invalid parameter at the beginning of webrtc_set_display()

[Version] 0.1.133
[Issue Type] Improvement

Change-Id: I1d744d05b270f15af7f4835d63e476d67d8d97d7

diff --git a/packaging/capi-media-webrtc.spec b/packaging/capi-media-webrtc.spec
index ac3235ecb28d1bbd020cf230a5cf7c51438d2761..007f4119fe0325dba2be6f9cec3f48b79f253f0b 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.1.132
+Version:    0.1.133
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/webrtc.c b/src/webrtc.c
index f5d93a1372c1f16aaff75826d927f7bc47834745..d3c96f27e8ac2ab78886808c3b094d0d92f137ef 100644 (file)
--- a/src/webrtc.c
+++ b/src/webrtc.c
@@ -441,6 +441,7 @@ int webrtc_set_display(webrtc_h webrtc, unsigned int track_id, webrtc_display_ty
 
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
        RET_VAL_IF(track_id == 0, WEBRTC_ERROR_INVALID_PARAMETER, "track id is 0");
+       RET_VAL_IF(type > WEBRTC_DISPLAY_TYPE_EVAS, WEBRTC_ERROR_INVALID_PARAMETER, "invalid display type(%d)", type);
        RET_VAL_IF(display == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "display is NULL");
 
        g_mutex_lock(&_webrtc->mutex);
@@ -448,7 +449,6 @@ int webrtc_set_display(webrtc_h webrtc, unsigned int track_id, webrtc_display_ty
        RET_VAL_WITH_UNLOCK_IF(_webrtc->track_added_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, &_webrtc->mutex, "callback was not set");
        RET_VAL_WITH_UNLOCK_IF(!_is_owner_of_track_build_context(_webrtc, track_id), WEBRTC_ERROR_INVALID_OPERATION, &_webrtc->mutex,
                        "this function should be called within the track added callback");
-       RET_VAL_IF(type > WEBRTC_DISPLAY_TYPE_EVAS, WEBRTC_ERROR_INVALID_PARAMETER, "invalid display type(%d)", type);
 
        ret = _set_display_to_sink(webrtc, track_id, (unsigned int)type, (void *)display);
        if (ret == WEBRTC_ERROR_NONE)