From a4084389d6e6e57042fda82561efbb161756e191 Mon Sep 17 00:00:00 2001 From: Sangchul Lee Date: Mon, 20 Jan 2025 15:06:01 +0900 Subject: [PATCH] Fix SVACE defect (DEREF_OF_NULL.EX) The defect only belonged to 'src/webrtc_resource.c'. But similar codes in other files have also been revised. [Version] 1.1.45 [Issue Type] SVACE Change-Id: I9e6d201d9de7a060663c941e57b6d3346d1a9a09 Signed-off-by: Sangchul Lee --- packaging/capi-media-webrtc.spec | 2 +- src/webrtc_resource.c | 2 +- src/webrtc_signaling_client.c | 2 +- src/webrtc_signaling_server.c | 2 +- src/webrtc_sink_snapshot.c | 6 +++--- src/webrtc_stats.c | 2 +- test/webrtc_test.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packaging/capi-media-webrtc.spec b/packaging/capi-media-webrtc.spec index 1690d56e..8c4026f5 100644 --- 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: 1.1.44 +Version: 1.1.45 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/webrtc_resource.c b/src/webrtc_resource.c index e54a71f4..c03d9b88 100644 --- a/src/webrtc_resource.c +++ b/src/webrtc_resource.c @@ -32,7 +32,7 @@ static int __get_appid_by_pid(int pid, char *name, size_t size) cmdline = g_strdup_printf("/proc/%d/cmdline", pid); if (!g_file_get_contents(cmdline, &contents, NULL, &error)) { - LOG_ERROR("error : %s", error->message); + LOG_ERROR("error:%s", error ? error->message : "null"); return WEBRTC_ERROR_INVALID_OPERATION; } diff --git a/src/webrtc_signaling_client.c b/src/webrtc_signaling_client.c index 40849642..93888ee3 100644 --- a/src/webrtc_signaling_client.c +++ b/src/webrtc_signaling_client.c @@ -144,7 +144,7 @@ static void __websocket_connected_cb(SoupSession *session, GAsyncResult *res, vo ws_conn = soup_session_websocket_connect_finish(session, res, &error); if (!ws_conn) { - LOG_ERROR("failed to soup_session_websocket_connect_finish(), error[%s]", error->message); + LOG_ERROR("failed to soup_session_websocket_connect_finish(), error:%s", error ? error->message : "null"); g_error_free(error); return; } diff --git a/src/webrtc_signaling_server.c b/src/webrtc_signaling_server.c index 7b434621..7ad374cb 100644 --- a/src/webrtc_signaling_server.c +++ b/src/webrtc_signaling_server.c @@ -445,7 +445,7 @@ int webrtc_signaling_server_start(webrtc_signaling_server_h server) _server->thread = g_thread_try_new("signaling-thread", __thread_func, _server, &error); RET_VAL_IF(_server->thread == NULL, WEBRTC_ERROR_INVALID_OPERATION, - "failed to g_thread_try_new(), error[%s]", error->message); + "failed to g_thread_try_new(), error:%s", error ? error->message : "null"); LOG_INFO("server[%p, thread:%p]", _server, _server->thread); diff --git a/src/webrtc_sink_snapshot.c b/src/webrtc_sink_snapshot.c index 31d87ebf..3f99825c 100644 --- a/src/webrtc_sink_snapshot.c +++ b/src/webrtc_sink_snapshot.c @@ -388,7 +388,7 @@ static void __dump_rgb24_result(webrtc_video_frame_s *result, unsigned int idx) file_path = g_strdup_printf("/tmp/snapshot_%03u_%ux%u_RGB24.dump", idx, result->width, result->height); if (!g_file_set_contents(file_path, (char *)result->data, result->size, &error)) { - LOG_ERROR("failed to g_file_set_contents() for %s, error:%s", file_path, error->message); + LOG_ERROR("failed to g_file_set_contents() for %s, error:%s", file_path, error ? error->message : "null"); return; } @@ -409,7 +409,7 @@ static void __dump_encoded_result(webrtc_video_frame_s *result, int target_forma idx, result->width, result->height, __get_format_str((webrtc_snapshot_format_e)target_format), option); if (!g_file_set_contents(file_path, (char *)result->data, result->size, &error)) { - LOG_ERROR("failed to g_file_set_contents() for %s, error:%s", file_path, error->message); + LOG_ERROR("failed to g_file_set_contents() for %s, error:%s", file_path, error ? error->message : "null"); return; } @@ -570,4 +570,4 @@ int _capture_video_frame(webrtc_gst_slot_s *sink) return WEBRTC_ERROR_NONE; } -//LCOV_EXCL_STOP \ No newline at end of file +//LCOV_EXCL_STOP diff --git a/src/webrtc_stats.c b/src/webrtc_stats.c index ace3ba2e..2acaf0cd 100644 --- a/src/webrtc_stats.c +++ b/src/webrtc_stats.c @@ -921,7 +921,7 @@ static void __dump_json_object_to_file(JsonObject *object, const gchar *path) generator = json_generator_new(); json_generator_set_root(generator, root); if (!json_generator_to_file(generator, path, &error)) - LOG_ERROR("failed to json_generator_to_file() for %s, error:%s", path, error ? error->message : "none"); + LOG_ERROR("failed to json_generator_to_file() for %s, error:%s", path, error ? error->message : "null"); g_object_unref(generator); json_node_free(root); diff --git a/test/webrtc_test.c b/test/webrtc_test.c index 8eb26ade..8384ac89 100644 --- a/test/webrtc_test.c +++ b/test/webrtc_test.c @@ -1535,7 +1535,7 @@ static void __file_dump(const gchar *file_name, void *src_buffer, int size) full_path = g_strdup_printf("/tmp/%s", file_name); if (!g_file_set_contents((const gchar *)full_path, (const gchar *)src_buffer, (gssize)size, &error)) - g_print("__file_dump(), failed to g_file_set_contents[%s], error:%s\n", full_path, error ? error->message : "none"); + g_print("__file_dump(), failed to g_file_set_contents[%s], error:%s\n", full_path, error ? error->message : "null"); else g_print("__file_dump(), [%s, %d bytes] is ready\n", full_path, size); } -- 2.34.1