From 631ca1a6447207cb0d55c1b208bf1b68f0449299 Mon Sep 17 00:00:00 2001 From: sunghyun kim Date: Tue, 20 Sep 2016 16:24:20 +0900 Subject: [PATCH] [SDL_Tizen] fix svace issues. fix some svace issue Change-Id: I288d8af64bd07f24c3e7ffe4baf9ba9aedfb1d5e --- src/test/SDL_test_log.c | 22 ++-------------------- src/video/tizen/SDL_tizenmouse.c | 1 + src/video/wayland/SDL_waylandmouse.c | 1 + 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/test/SDL_test_log.c b/src/test/SDL_test_log.c index 19f57a0..7156659 100755 --- a/src/test/SDL_test_log.c +++ b/src/test/SDL_test_log.c @@ -87,16 +87,7 @@ void SDLTest_Log(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) } size_t len = SDL_strlen(logMessage); - strcpy(message, logMessage); - - // Chop off final endline. - - if ((len > 0) && (message[len-1] == '\n')) { - message[--len] = '\0'; - if ((len > 0) && (message[len-1] == '\r')) { // catch "\r\n", too. - message[--len] = '\0'; - } - } + SDL_strlcpy(message, logMessage,len+1); SDL_RWops *rwops = SDL_RWFromFile("log.txt", "a+"); char *text; @@ -137,16 +128,7 @@ void SDLTest_LogError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) } size_t len = SDL_strlen(logMessage); - strcpy(message, logMessage); - - // Chop off final endline. - - if ((len > 0) && (message[len-1] == '\n')) { - message[--len] = '\0'; - if ((len > 0) && (message[len-1] == '\r')) { // catch "\r\n", too. - message[--len] = '\0'; - } - } + SDL_strlcpy(message, logMessage,len+1); SDL_RWops *rwops = SDL_RWFromFile("log.txt", "a+"); char *text; diff --git a/src/video/tizen/SDL_tizenmouse.c b/src/video/tizen/SDL_tizenmouse.c index 84bfaf5..6aa46ad 100755 --- a/src/video/tizen/SDL_tizenmouse.c +++ b/src/video/tizen/SDL_tizenmouse.c @@ -112,6 +112,7 @@ create_buffer_from_shm(Tizen_CursorData *d, int width, int height, uint32_t form d->shm_data = NULL; fprintf (stderr, "mmap () failed\n"); close (shm_fd); + return -1; } shm_pool = wl_shm_create_pool(ecore_wl_shm_get(), shm_fd, size); diff --git a/src/video/wayland/SDL_waylandmouse.c b/src/video/wayland/SDL_waylandmouse.c index b810f77..38b0d31 100644 --- a/src/video/wayland/SDL_waylandmouse.c +++ b/src/video/wayland/SDL_waylandmouse.c @@ -130,6 +130,7 @@ create_buffer_from_shm(Wayland_CursorData *d, d->shm_data = NULL; fprintf (stderr, "mmap () failed\n"); close (shm_fd); + return -1; } shm_pool = wl_shm_create_pool(data->shm, shm_fd, size); -- 2.7.4