X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=blobdiff_plain;f=src%2Fmessagehandler.c;h=c5233f9647a31fd158f049591b664dc2358d0ef1;hp=c9dad4a57b6858515cce1a42039617bf7e368c8b;hb=0b2541420086a2e924ba5f192f36c137b958993c;hpb=06ded078a1693fb2620b3f1b4eab83e6fbfc37b5

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);
 		}