From 2176a0f8660a449d07ef97e1d43a3a0cc8dba8d5 Mon Sep 17 00:00:00 2001 From: jkjo92 Date: Tue, 25 Jul 2017 20:39:36 +0900 Subject: [PATCH] fix svace issue Change-Id: Ice2f99521cf960bd46953166473a57940172f13e Signed-off-by: jkjo92 --- common/fido_tlv_util.c | 3 ++- server/fido_server.c | 22 +++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/common/fido_tlv_util.c b/common/fido_tlv_util.c index ced34e0..b4c9e25 100755 --- a/common/fido_tlv_util.c +++ b/common/fido_tlv_util.c @@ -140,11 +140,12 @@ _tlv_util_decode_reg_assertion(char *tlv_enc) } _INFO("Found TAG_KEYID"); + SAFE_DELETE(tlv_dec); return assrt_tlv; } } - + SAFE_DELETE(tlv_dec); return NULL; } diff --git a/server/fido_server.c b/server/fido_server.c index 51b6ae8..0bd206f 100755 --- a/server/fido_server.c +++ b/server/fido_server.c @@ -726,12 +726,15 @@ _ui_response_callback(int error_code, _ui_auth_data_t *selected_auth_data, void match_data->auth_index = selected_auth_data->auth_index; match_data->asm_id = strdup(selected_auth_data->asm_id); - if ((cb_data != NULL) && (cb_data->type == _PROCESS_TYPE_REG)) + if (cb_data->type == _PROCESS_TYPE_REG) __handle_reg(cb_data, match_data); - - if ((cb_data != NULL) && (cb_data->type == _PROCESS_TYPE_AUTH)) + else if (cb_data->type == _PROCESS_TYPE_AUTH) __handle_auth(cb_data, match_data); - + else { + _send_process_response(cb_data, FIDO_ERROR_UNKNOWN, NULL); + _free_matched_auth_data(match_data); + return; + } _free_matched_auth_data(match_data); } @@ -1199,11 +1202,16 @@ _discover_response_cb_for_process(int tz_error_code, int error_code, GList *avai if (allowed_auth_list_iter != NULL) { _matched_auth_data_t *match_data = (_matched_auth_data_t *)(allowed_auth_list_iter->data); - if ((cb_data != NULL) && (cb_data->type == _PROCESS_TYPE_REG)) + if (cb_data->type == _PROCESS_TYPE_REG) __handle_reg(cb_data, match_data); - - if ((cb_data != NULL) && (cb_data->type == _PROCESS_TYPE_AUTH)) + else if (cb_data->type == _PROCESS_TYPE_AUTH) __handle_auth(cb_data, match_data); + else { + _send_process_response(cb_data, FIDO_ERROR_UNKNOWN, NULL); + if (allowed_auth_list != NULL) + g_list_free_full(allowed_auth_list, _free_matched_auth_data); + return; + } } } if (allowed_auth_list != NULL) -- 2.7.4