From 7f894dc96342a6a4f88ce66c57641996b501bc14 Mon Sep 17 00:00:00 2001 From: Eunhae Choi Date: Thu, 3 Dec 2015 20:12:39 +0900 Subject: [PATCH] fix svace issues Change-Id: I8aa6b00bdb6ce4f4390bb315ae3193f84c52ffe1 --- test/legacy_player_media_packet_test.c | 4 ++++ test/legacy_player_test.c | 32 +++++++++++++++++++++++++------- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/test/legacy_player_media_packet_test.c b/test/legacy_player_media_packet_test.c index 9a72afd..592dc84 100644 --- a/test/legacy_player_media_packet_test.c +++ b/test/legacy_player_media_packet_test.c @@ -236,6 +236,10 @@ pipe_cb(void *data, void *buf, unsigned int len) tbm_surface_get_info(surface,&suf_info); buf_data = (unsigned char*)g_malloc0(suf_info.size); + if (!buf_data) { + LOGE("no free space"); + return; + } ptr = buf_data; for (plane_idx = 0; plane_idx < suf_info.num_planes; plane_idx++) { diff --git a/test/legacy_player_test.c b/test/legacy_player_test.c index b1bf9f6..6a50a49 100644 --- a/test/legacy_player_test.c +++ b/test/legacy_player_test.c @@ -331,7 +331,7 @@ int _save(unsigned char * src, int length) static int WRITE_COUNT = 0; //gchar *filename = CAPTUERD_IMAGE_SAVE_PATH; - sprintf (filename, "ALBUM_ART_IMAGE_%d", WRITE_COUNT); + snprintf (filename, 256, "ALBUM_ART_IMAGE_%d", WRITE_COUNT); WRITE_COUNT++; fp=fopen(filename, "w+"); if(fp==NULL) @@ -494,6 +494,14 @@ static void buffer_need_video_data_cb(unsigned int size, void *user_data) if (fp) { buff_ptr = (guint8 *)g_malloc0(1048576); + if (!buff_ptr) + { + g_print("no free space\n"); + fclose(fp); + fp = NULL; + return; + } + real_read_len = fread(buff_ptr, 1, size, fp); fclose(fp); fp = NULL; @@ -514,13 +522,13 @@ static void buffer_need_video_data_cb(unsigned int size, void *user_data) if (media_packet_get_buffer_data_ptr(g_video_pkt, &src) != MEDIA_PACKET_ERROR_NONE) - return; + goto EXIT; if (media_packet_set_pts(g_video_pkt, (uint64_t)(pts/1000000)) != MEDIA_PACKET_ERROR_NONE) - return; + goto EXIT; if (media_packet_set_buffer_size(g_video_pkt, (uint64_t)real_read_len) != MEDIA_PACKET_ERROR_NONE) - return; + goto EXIT; memcpy(src, buff_ptr, real_read_len); @@ -528,6 +536,7 @@ static void buffer_need_video_data_cb(unsigned int size, void *user_data) player_push_media_stream(g_player[0], g_video_pkt); #endif +EXIT: if (buff_ptr) { g_free(buff_ptr); @@ -565,6 +574,14 @@ static void buffer_need_audio_data_cb(unsigned int size, void *user_data) if (fp) { buff_ptr = (guint8 *)g_malloc0(1048576); + if (!buff_ptr) + { + g_print("no free space\n"); + fclose(fp); + fp = NULL; + return; + } + real_read_len = fread(buff_ptr, 1, size, fp); fclose(fp); fp = NULL; @@ -585,13 +602,13 @@ static void buffer_need_audio_data_cb(unsigned int size, void *user_data) if (media_packet_get_buffer_data_ptr(g_audio_pkt, &src) != MEDIA_PACKET_ERROR_NONE) - return; + goto EXIT; if (media_packet_set_pts(g_audio_pkt, (uint64_t)(audio_pts/1000000)) != MEDIA_PACKET_ERROR_NONE) - return; + goto EXIT; if (media_packet_set_buffer_size(g_audio_pkt, (uint64_t)real_read_len) != MEDIA_PACKET_ERROR_NONE) - return; + goto EXIT; memcpy(src, buff_ptr, real_read_len); @@ -601,6 +618,7 @@ static void buffer_need_audio_data_cb(unsigned int size, void *user_data) audio_pts += audio_dur; +EXIT: if (buff_ptr) { g_free(buff_ptr); -- 2.7.4