From 88fc70c48008616ad7b8b71da5a2d4b99f3dc0d6 Mon Sep 17 00:00:00 2001 From: Jaeyun Jung Date: Mon, 20 Mar 2023 18:01:45 +0900 Subject: [PATCH] [CodeClean] fix res leak case Fix svace issues, handle res leak. Signed-off-by: Jaeyun Jung --- src/libnnstreamer-edge/nnstreamer-edge-internal.c | 9 ++++----- src/libnnstreamer-edge/nnstreamer-edge-mqtt-mosquitto.c | 1 + src/libnnstreamer-edge/nnstreamer-edge-mqtt-paho.c | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libnnstreamer-edge/nnstreamer-edge-internal.c b/src/libnnstreamer-edge/nnstreamer-edge-internal.c index c54570c..99d1e54 100644 --- a/src/libnnstreamer-edge/nnstreamer-edge-internal.c +++ b/src/libnnstreamer-edge/nnstreamer-edge-internal.c @@ -1504,7 +1504,7 @@ _mqtt_hybrid_direct_connection (nns_edge_handle_s * eh) ret = nns_edge_mqtt_get_message (eh->broker_h, (void **) &msg, &msg_len); if (ret != NNS_EDGE_ERROR_NONE || !msg || msg_len == 0) - return ret; + break; nns_edge_parse_host_string (msg, &server_ip, &server_port); SAFE_FREE (msg); @@ -1515,9 +1515,8 @@ _mqtt_hybrid_direct_connection (nns_edge_handle_s * eh) ret = _nns_edge_connect_to (eh, eh->client_id, server_ip, server_port); SAFE_FREE (server_ip); - if (NNS_EDGE_ERROR_NONE == ret) { - return ret; - } + if (NNS_EDGE_ERROR_NONE == ret) + break; } while (TRUE); return ret; @@ -1613,7 +1612,7 @@ nns_edge_connect (nns_edge_h edge_h, const char *dest_host, int dest_port) eh->user_data); if (NNS_EDGE_ERROR_NONE != ret) { nns_edge_loge ("Failed to set event callback to MQTT broker."); - return ret; + goto done; } } } else if (NNS_EDGE_CONNECT_TYPE_AITT == eh->connect_type) { diff --git a/src/libnnstreamer-edge/nnstreamer-edge-mqtt-mosquitto.c b/src/libnnstreamer-edge/nnstreamer-edge-mqtt-mosquitto.c index c6bbb28..aebbd44 100644 --- a/src/libnnstreamer-edge/nnstreamer-edge-mqtt-mosquitto.c +++ b/src/libnnstreamer-edge/nnstreamer-edge-mqtt-mosquitto.c @@ -74,6 +74,7 @@ on_message_callback (struct mosquitto *client, void *data, if (nns_edge_data_create (&data_h) != NNS_EDGE_ERROR_NONE) { nns_edge_loge ("Failed to create data handle in msg thread."); + SAFE_FREE (msg); return; } diff --git a/src/libnnstreamer-edge/nnstreamer-edge-mqtt-paho.c b/src/libnnstreamer-edge/nnstreamer-edge-mqtt-paho.c index 61836de..8a76cde 100644 --- a/src/libnnstreamer-edge/nnstreamer-edge-mqtt-paho.c +++ b/src/libnnstreamer-edge/nnstreamer-edge-mqtt-paho.c @@ -78,6 +78,7 @@ mqtt_cb_message_arrived (void *context, char *topic, int topic_len, if (nns_edge_data_create (&data_h) != NNS_EDGE_ERROR_NONE) { nns_edge_loge ("Failed to create data handle in msg thread."); + SAFE_FREE (msg); return TRUE; } -- 2.34.1