Fix prevent issue

Change-Id: Ie1109b39706ff3047d7037b1095007d449916c00
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/src/mm_camcorder_attribute.c b/src/mm_camcorder_attribute.c
index 0d3c557dc8cb68f92b5338dec368404f9c93f3f4..54c018bca46d8c241b371d5396c4e855e6d5da8e 100644 (file)
--- a/src/mm_camcorder_attribute.c
+++ b/src/mm_camcorder_attribute.c
@@ -3189,6 +3189,11 @@ bool _mmcamcorder_commit_display_handle(MMHandleType handle, int attr_idx, const
        if (p_handle) {
                /* get videosink name */
                _mmcamcorder_conf_get_value_element_name(sc->VideosinkElement, &videosink_name);
+               if (videosink_name == NULL) {
+                       _mmcam_dbg_err("Please check videosink element in configuration file");
+                       return FALSE;
+               }
+
                _mmcam_dbg_log("Commit : videosinkname[%s]", videosink_name);
 
                if (!strcmp(videosink_name, "xvimagesink") ||
@@ -3257,6 +3262,11 @@ bool _mmcamcorder_commit_display_mode(MMHandleType handle, int attr_idx, const m
        sc = MMF_CAMCORDER_SUBCONTEXT(handle);
 
        _mmcamcorder_conf_get_value_element_name(sc->VideosinkElement, &videosink_name);
+       if (videosink_name == NULL) {
+               _mmcam_dbg_err("Please check videosink element in configuration file");
+               return FALSE;
+       }
+
        _mmcam_dbg_log("Commit : videosinkname[%s]", videosink_name);
 
        if (!strcmp(videosink_name, "xvimagesink")) {
@@ -3347,6 +3357,11 @@ bool _mmcamcorder_commit_display_visible(MMHandleType handle, int attr_idx, cons
 
        /* Get videosink name */
        _mmcamcorder_conf_get_value_element_name(sc->VideosinkElement, &videosink_name);
+       if (videosink_name == NULL) {
+               _mmcam_dbg_err("Please check videosink element in configuration file");
+               return FALSE;
+       }
+
        if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "evasimagesink") ||
            !strcmp(videosink_name, "evaspixmapsink")) {
                MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "visible", value->value.i_val);
@@ -3387,6 +3402,11 @@ bool _mmcamcorder_commit_display_geometry_method (MMHandleType handle, int attr_
 
        /* Get videosink name */
        _mmcamcorder_conf_get_value_element_name(sc->VideosinkElement, &videosink_name);
+       if (videosink_name == NULL) {
+               _mmcam_dbg_err("Please check videosink element in configuration file");
+               return FALSE;
+       }
+
        if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "evasimagesink") ||
            !strcmp(videosink_name, "evaspixmapsink")) {
                method = value->value.i_val;
@@ -3436,6 +3456,11 @@ bool _mmcamcorder_commit_display_rect(MMHandleType handle, int attr_idx, const m
 
        /* Get videosink name */
        _mmcamcorder_conf_get_value_element_name(sc->VideosinkElement, &videosink_name);
+       if (videosink_name == NULL) {
+               _mmcam_dbg_err("Please check videosink element in configuration file");
+               return FALSE;
+       }
+
        if (!strcmp(videosink_name, "xvimagesink") ||
            !strcmp(videosink_name, "evaspixmapsink")) {
                int rect_x = 0;
@@ -3535,6 +3560,11 @@ bool _mmcamcorder_commit_display_scale(MMHandleType handle, int attr_idx, const
 
        /* Get videosink name */
        _mmcamcorder_conf_get_value_element_name(sc->VideosinkElement, &videosink_name);
+       if (videosink_name == NULL) {
+               _mmcam_dbg_err("Please check videosink element in configuration file");
+               return FALSE;
+       }
+
        zoom = value->value.i_val;
        if (!strcmp(videosink_name, "xvimagesink")) {
                vs_element = sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst;
@@ -3580,6 +3610,11 @@ bool _mmcamcorder_commit_display_evas_do_scaling(MMHandleType handle, int attr_i
 
        /* Get videosink name */
        _mmcamcorder_conf_get_value_element_name(sc->VideosinkElement, &videosink_name);
+       if (videosink_name == NULL) {
+               _mmcam_dbg_err("Please check videosink element in configuration file");
+               return FALSE;
+       }
+
        if (!strcmp(videosink_name, "evaspixmapsink")) {
                MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "origin-size", !do_scaling);
                _mmcam_dbg_log("Set origin-size to %d", !(value->value.i_val));

diff --git a/src/mm_camcorder_gstcommon.c b/src/mm_camcorder_gstcommon.c
index 4cf601007caed8b5db10d2535784a40ba1c0ba21..3015466ee4889ab5f9a10a47709153593f38de73 100644 (file)
--- a/src/mm_camcorder_gstcommon.c
+++ b/src/mm_camcorder_gstcommon.c
@@ -2019,6 +2019,11 @@ bool _mmcamcorder_set_display_rotation(MMHandleType handle, int display_rotate)
        if (sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst) {
                /* Get videosink name */
                _mmcamcorder_conf_get_value_element_name(sc->VideosinkElement, &videosink_name);
+               if (videosink_name == NULL) {
+                       _mmcam_dbg_err("Please check videosink element in configuration file");
+                       return FALSE;
+               }
+
                if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "evasimagesink") ||
                    !strcmp(videosink_name, "evaspixmapsink")) {
                        MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst,
@@ -2053,6 +2058,11 @@ bool _mmcamcorder_set_display_flip(MMHandleType handle, int display_flip)
        if (sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst) {
                /* Get videosink name */
                _mmcamcorder_conf_get_value_element_name(sc->VideosinkElement, &videosink_name);
+               if (videosink_name == NULL) {
+                       _mmcam_dbg_err("Please check videosink element in configuration file");
+                       return FALSE;
+               }
+
                if (!strcmp(videosink_name, "xvimagesink") || !strcmp(videosink_name, "evasimagesink") ||
                    !strcmp(videosink_name, "evaspixmapsink")) {
                        MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst,