webrtc_display: Return NULL in case of mm_display_interface_init() failure

[Version] 0.3.249
[Issue Type] Bug fix

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

diff --git a/packaging/capi-media-webrtc.spec b/packaging/capi-media-webrtc.spec
index 648edcfe1988ccd6a8828cdcba10f29380ee41a1..84bf91cf45e29364582ad646b83793d241d11781 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.3.248
+Version:    0.3.249
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/webrtc_display.c b/src/webrtc_display.c
index 60514e24002a00c50e46f1e1cfc563e62afb9e31..2c2c7f80f3e03d9c270101e9377af52ca672e57e 100644 (file)
--- a/src/webrtc_display.c
+++ b/src/webrtc_display.c
@@ -767,17 +767,18 @@ webrtc_display_s *_alloc_display(void)
 {
        webrtc_display_s *display = g_new0(webrtc_display_s, 1);
 
-       g_mutex_init(&display->mutex);
-
-       if (mm_display_interface_init(&display->mm_display) != MM_ERROR_NONE)
-               LOG_WARNING("failed to mm_display_interface_init()");
-       else
-               LOG_DEBUG("init mm_display[%p]", display->mm_display);
+       if (mm_display_interface_init(&display->mm_display) != MM_ERROR_NONE) {
+               LOG_ERROR("failed to mm_display_interface_init()");
+               g_free(display);
+               return NULL;
+       }
 
+       g_mutex_init(&display->mutex);
        display->mode = WEBRTC_DISPLAY_MODE_LETTER_BOX;
        display->visible = true;
 
-       LOG_DEBUG("alloc display[%p, mode:%u, visible:%u]", display, display->mode, display->visible);
+       LOG_DEBUG("alloc display[%p, mm_display:%p, mode:%u, visible:%u]",
+               display, display->mm_display, display->mode, display->visible);
 
        return display;
 }