From c189173fe880c60bb23cc7d73466af192d9e3ecd Mon Sep 17 00:00:00 2001 From: Daekwang Ryu Date: Mon, 8 May 2017 15:19:35 +0900 Subject: [PATCH] [SDL_tizen] fix Svace issue check wayland window and surface before using it. Change-Id: Iee01f6e304d03a458f3d97c63bfe0c9c525c0b78 --- src/video/tizen/SDL_tizenwindow.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/video/tizen/SDL_tizenwindow.c b/src/video/tizen/SDL_tizenwindow.c index f00d371..08d754e 100755 --- a/src/video/tizen/SDL_tizenwindow.c +++ b/src/video/tizen/SDL_tizenwindow.c @@ -314,7 +314,13 @@ Tizen_CreateWindow(_THIS, SDL_Window *window) wind->window = ecore_wl_window_new(NULL, window->x, window->y, window->w, window->h, ECORE_WL_WINDOW_BUFFER_TYPE_SHM); + if (wind->window) { + SDL_LogError(SDL_LOG_CATEGORY_ASSERT, "Failed to create wayland window"); + } wind->surface = ecore_wl_window_surface_create(wind->window); + if (wind->surface) { + SDL_LogError(SDL_LOG_CATEGORY_ASSERT, "Failed to create wayland window surface"); + } ecore_wl_window_type_set(wind->window, ECORE_WL_WINDOW_TYPE_UTILITY); wind->rotation = 0; @@ -323,7 +329,7 @@ Tizen_CreateWindow(_THIS, SDL_Window *window) #if SDL_VIDEO_OPENGL_EGL if (window->flags & SDL_WINDOW_OPENGL) { - wind->egl_window = wl_egl_window_create(ecore_wl_window_surface_get(wind->window), window->w, window->h); + wind->egl_window = wl_egl_window_create(wind->surface, window->w, window->h); /* Create the GLES window surface */ wind->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) wind->egl_window); @@ -336,7 +342,7 @@ Tizen_CreateWindow(_THIS, SDL_Window *window) ecore_wl_window_opaque_region_set(wind->window, window->x, window->y, window->w, window->h); } else { - wl_surface_set_opaque_region(ecore_wl_window_surface_get(wind->window), NULL); + wl_surface_set_opaque_region(wind->surface, NULL); } //Support PreRotation -- 2.7.4