From 0b2541420086a2e924ba5f192f36c137b958993c Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Wed, 27 Dec 2017 16:22:11 +0100 Subject: [PATCH] Remove useless if's around free() calls. It is legal to free(NULL). --- src/client.c | 16 +++++-------- src/messagehandler.c | 9 ++++---- src/messages.c | 55 +++++++++++++++----------------------------- 3 files changed, 28 insertions(+), 52 deletions(-) diff --git a/src/client.c b/src/client.c index 80cbe3d..1aea8e2 100644 --- a/src/client.c +++ b/src/client.c @@ -399,16 +399,12 @@ void Client_free(client_t *client) SSLi_free(client->ssl); close(client->tcpfd); clientcount--; - if (client->release) - free(client->release); - if (client->os) - free(client->os); - if (client->os_version) - free(client->os_version); - if (client->username) - free(client->username); - if (client->context) - free(client->context); + + free(client->release); + free(client->os); + free(client->os_version); + free(client->username); + free(client->context); free(client); if (authenticatedLeft) diff --git a/src/messagehandler.c b/src/messagehandler.c index c9dad4a..c5233f9 100644 --- a/src/messagehandler.c +++ b/src/messagehandler.c @@ -554,8 +554,7 @@ void Mh_handle_message(client_t *client, message_t *msg) } } if (msg->payload.userState->has_plugin_context) { - if (client->context) - free(client->context); + free(client->context); client->context = Memory_safeMalloc(1, msg->payload.userState->plugin_context.len); memcpy(client->context, msg->payload.userState->plugin_context.data, msg->payload.userState->plugin_context.len); @@ -662,17 +661,17 @@ void Mh_handle_message(client_t *client, message_t *msg) Log_debug("Client version 0x%x", client->version); } if (msg->payload.version->release) { - if (client->release) free(client->release); + free(client->release); client->release = strdup(msg->payload.version->release); Log_debug("Client release %s", client->release); } if (msg->payload.version->os) { - if (client->os) free(client->os); + free(client->os); client->os = strdup(msg->payload.version->os); Log_debug("Client OS %s", client->os); } if (msg->payload.version->os_version) { - if (client->os_version) free(client->os_version); + free(client->os_version); client->os_version = strdup(msg->payload.version->os_version); Log_debug("Client OS version %s", client->os_version); } diff --git a/src/messages.c b/src/messages.c index 36bd20c..9d98dbf 100644 --- a/src/messages.c +++ b/src/messages.c @@ -452,12 +452,9 @@ void Msg_free(message_t *msg) if (msg->unpacked) mumble_proto__version__free_unpacked(msg->payload.version, NULL); else { - if (msg->payload.version->release) - free(msg->payload.version->release); - if (msg->payload.version->os) - free(msg->payload.version->os); - if (msg->payload.version->os_version) - free(msg->payload.version->os_version); + free(msg->payload.version->release); + free(msg->payload.version->os); + free(msg->payload.version->os_version); free(msg->payload.version); } break; @@ -502,14 +499,10 @@ void Msg_free(message_t *msg) if (msg->unpacked) mumble_proto__text_message__free_unpacked(msg->payload.textMessage, NULL); else { - if (msg->payload.textMessage->message) - free(msg->payload.textMessage->message); - if (msg->payload.textMessage->session) - free(msg->payload.textMessage->session); - if (msg->payload.textMessage->channel_id) - free(msg->payload.textMessage->channel_id); - if (msg->payload.textMessage->tree_id) - free(msg->payload.textMessage->tree_id); + free(msg->payload.textMessage->message); + free(msg->payload.textMessage->session); + free(msg->payload.textMessage->channel_id); + free(msg->payload.textMessage->tree_id); free(msg->payload.textMessage); } break; @@ -547,12 +540,9 @@ void Msg_free(message_t *msg) if (msg->unpacked) mumble_proto__channel_state__free_unpacked(msg->payload.channelState, NULL); else { - if (msg->payload.channelState->name) - free(msg->payload.channelState->name); - if (msg->payload.channelState->description) - free(msg->payload.channelState->description); - if (msg->payload.channelState->links) - free(msg->payload.channelState->links); + free(msg->payload.channelState->name); + free(msg->payload.channelState->description); + free(msg->payload.channelState->links); free(msg->payload.channelState); } break; @@ -595,29 +585,20 @@ void Msg_free(message_t *msg) if (msg->unpacked) mumble_proto__user_stats__free_unpacked(msg->payload.userStats, NULL); else { - if (msg->payload.userStats->from_client) - free(msg->payload.userStats->from_client); - if (msg->payload.userStats->from_server) - free(msg->payload.userStats->from_server); + free(msg->payload.userStats->from_client); + free(msg->payload.userStats->from_server); if (msg->payload.userStats->version) { - if (msg->payload.userStats->version->release) - free(msg->payload.userStats->version->release); - if (msg->payload.userStats->version->os) - free(msg->payload.userStats->version->os); - if (msg->payload.userStats->version->os_version) - free(msg->payload.userStats->version->os_version); - + free(msg->payload.userStats->version->release); + free(msg->payload.userStats->version->os); + free(msg->payload.userStats->version->os_version); free(msg->payload.userStats->version); } - if (msg->payload.userStats->celt_versions) - free(msg->payload.userStats->celt_versions); + free(msg->payload.userStats->celt_versions); if (msg->payload.userStats->certificates) { - if (msg->payload.userStats->certificates->data) - free(msg->payload.userStats->certificates->data); + free(msg->payload.userStats->certificates->data); free(msg->payload.userStats->certificates); } - if (msg->payload.userStats->address.data) - free(msg->payload.userStats->address.data); + free(msg->payload.userStats->address.data); free(msg->payload.userStats); } -- 2.30.2