Remove useless if's around free() calls.

It is legal to free(NULL).

diff --git a/src/client.c b/src/client.c
index 80cbe3d67802e850d68b7a9d2d570ac3976d8c8f..1aea8e2fb5fadb32a66014f1182c761f2f84c875 100644 (file)
--- 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 c9dad4a57b6858515cce1a42039617bf7e368c8b..c5233f9647a31fd158f049591b664dc2358d0ef1 100644 (file)
--- 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 36bd20ccd6c236ec5dc8f4c146eefec3648e59ca..9d98dbff88ae852b57ef3db6ed9b6e6dfc712058 100644 (file)
--- 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);
                }