[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5225: Remove unnecessary NULL checks before free() invocations on pointers.
- From: noreply@xxxxxxxxxxxxx
- To: HIPL core team <hipl-dev@xxxxxxxxxxxxx>
- Date: Tue, 30 Nov 2010 14:56:37 -0000
------------------------------------------------------------
revno: 5225
committer: Diego Biurrun <diego@xxxxxxxxxx>
branch nick: free
timestamp: Tue 2010-11-30 15:50:30 +0100
message:
Remove unnecessary NULL checks before free() invocations on pointers.
free() can handle NULL pointers just fine, it is even required by the standard
and not just OK by accident. Quoting from the POSIX spec:
The free() function shall cause the space pointed to by ptr to be
deallocated; that is, made available for further allocation. If ptr
is a null pointer, no action shall occur.
This time around only checks directly before free() invocations were changed
and the diff was doublechecked by the able eyes of Stefan Götz.
modified:
firewall/cache.c
firewall/conntrack.c
firewall/esp_prot_conntrack.c
firewall/esp_prot_fw_msg.c
firewall/firewall.c
firewall/firewall_control.c
firewall/lsi.c
firewall/pisa.c
firewall/rule_management.c
firewall/sysopp.c
firewall/user_ipsec_api.c
firewall/user_ipsec_fw_msg.c
firewall/user_ipsec_sadb.c
hipd/cert.c
hipd/close.c
hipd/cookie.c
hipd/esp_prot_anchordb.c
hipd/esp_prot_hipd_msg.c
hipd/esp_prot_light_update.c
hipd/hadb.c
hipd/hidb.c
hipd/hipd.c
hipd/hiprelay.c
hipd/hit_to_ip.c
hipd/init.c
hipd/input.c
hipd/keymat.c
hipd/maintenance.c
hipd/nat.c
hipd/nsupdate.c
hipd/oppdb.c
hipd/output.c
hipd/pisa.c
hipd/registration.c
hipd/user_ipsec_hipd_msg.c
lib/core/builder.c
lib/core/certtools.c
lib/core/conf.c
lib/core/crypto.c
lib/core/filemanip.c
lib/core/hashchain.c
lib/core/hashtree.c
lib/core/hostid.c
lib/core/message.c
lib/core/modularization.c
lib/core/performance.c
lib/tool/nlink.c
lib/tool/pk.c
modules/heartbeat/hipd/heartbeat.c
modules/heartbeat_update/hipd/hb_update.c
modules/update/hipd/update.c
modules/update/hipd/update_legacy.c
test/certteststub.c
tools/pisacert.c
--
lp:hipl
https://code.launchpad.net/~hipl-core/hipl/trunk
Your team HIPL core team is subscribed to branch lp:hipl.
To unsubscribe from this branch go to
https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription
=== modified file 'firewall/cache.c'
--- firewall/cache.c 2010-11-12 15:49:05 +0000
+++ firewall/cache.c 2010-11-30 14:50:30 +0000
@@ -160,11 +160,7 @@
}
out_err:
-
- if (msg) {
- free(msg);
- }
-
+ free(msg);
return ha_ret;
}
=== modified file 'firewall/conntrack.c'
--- firewall/conntrack.c 2010-11-30 10:33:47 +0000
+++ firewall/conntrack.c 2010-11-30 14:50:30 +0000
@@ -510,9 +510,7 @@
}
}
- if (hip_tuple->data->src_hi) {
- free(hip_tuple->data->src_hi);
- }
+ free(hip_tuple->data->src_hi);
free(hip_tuple->data);
hip_tuple->data = NULL;
@@ -584,15 +582,11 @@
tuple->connection = NULL;
// tuple was not malloced -> no free here
- if (tuple->src_ip) {
- free(tuple->src_ip);
- tuple->src_ip = NULL;
- }
+ free(tuple->src_ip);
+ tuple->src_ip = NULL;
- if (tuple->dst_ip) {
- free(tuple->dst_ip);
- tuple->dst_ip = NULL;
- }
+ free(tuple->dst_ip);
+ tuple->dst_ip = NULL;
}
}
=== modified file 'firewall/esp_prot_conntrack.c'
--- firewall/esp_prot_conntrack.c 2010-11-19 14:32:22 +0000
+++ firewall/esp_prot_conntrack.c 2010-11-30 14:50:30 +0000
@@ -113,15 +113,9 @@
anchor_item = cache_item;
for (i = 0; i < num_parallel_hchains; i++) {
- if (anchor_item->active_anchors[i]) {
- free(anchor_item->active_anchors[i]);
- }
- if (anchor_item->next_anchors[i]) {
- free(anchor_item->next_anchors[i]);
- }
- if (anchor_item->roots[i]) {
- free(anchor_item->roots[i]);
- }
+ free(anchor_item->active_anchors[i]);
+ free(anchor_item->next_anchors[i]);
+ free(anchor_item->roots[i]);
}
free(anchor_item);
@@ -285,9 +279,7 @@
"failed to add anchor_item to anchor_cache\n");
out_err:
- if (cmp_value) {
- free(cmp_value);
- }
+ free(cmp_value);
return err;
}
@@ -723,10 +715,8 @@
out_err:
if (err) {
- if (esp_tuple) {
- free(esp_tuple);
- esp_tuple = NULL;
- }
+ free(esp_tuple);
+ esp_tuple = NULL;
}
return err;
@@ -968,12 +958,8 @@
hip_ll_uninit(&esp_tuple->anchor_cache,
esp_prot_conntrack_free_cached_item);
for (i = 0; i < esp_tuple->num_hchains; i++) {
- if (esp_tuple->active_roots[i]) {
- free(esp_tuple->active_roots[i]);
- }
- if (esp_tuple->next_roots[i]) {
- free(esp_tuple->next_roots[i]);
- }
+ free(esp_tuple->active_roots[i]);
+ free(esp_tuple->next_roots[i]);
}
return err;
@@ -1254,9 +1240,7 @@
// change roots
/* the BEX-store does not have hierarchies, so no root is used for
* the first hchain */
- if (esp_tuple->active_roots[active_hchain]) {
- free(esp_tuple->active_roots[active_hchain]);
- }
+ free(esp_tuple->active_roots[active_hchain]);
esp_tuple->active_roots[active_hchain] =
esp_tuple->next_roots[active_hchain];
esp_tuple->next_roots[active_hchain] = NULL;
esp_tuple->active_root_length =
esp_tuple->next_root_length[active_hchain];
=== modified file 'firewall/esp_prot_fw_msg.c'
--- firewall/esp_prot_fw_msg.c 2010-10-15 15:29:14 +0000
+++ firewall/esp_prot_fw_msg.c 2010-11-30 14:50:30 +0000
@@ -273,10 +273,7 @@
HIP_DEBUG("send_recv msg succeeded\n");
out_err:
- if (msg) {
- free(msg);
- }
-
+ free(msg);
return err;
}
@@ -312,10 +309,7 @@
HIP_DEBUG("send_recv msg succeeded\n");
out_err:
- if (msg) {
- free(msg);
- }
-
+ free(msg);
return err;
}
@@ -489,13 +483,8 @@
HIP_DEBUG("send_recv msg succeeded\n");
out_err:
- if (msg) {
- free(msg);
- }
- if (branch_nodes) {
- free(branch_nodes);
- }
-
+ free(msg);
+ free(branch_nodes);
return err;
}
@@ -582,10 +571,7 @@
HIP_DEBUG("send_recv msg succeeded\n");
out_err:
- if (msg) {
- free(msg);
- }
-
+ free(msg);
return err;
}
=== modified file 'firewall/firewall.c'
--- firewall/firewall.c 2010-10-24 21:32:10 +0000
+++ firewall/firewall.c 2010-11-30 14:50:30 +0000
@@ -612,10 +612,7 @@
ipv4_addr_copy(&default_lsi, lsi);
out_err:
- if (msg) {
- free(msg);
- }
-
+ free(msg);
return err;
}
@@ -2272,9 +2269,7 @@
if (hip_fw_sock) {
close(hip_fw_sock);
}
- if (msg != NULL) {
- free(msg);
- }
+ free(msg);
firewall_exit();
return err;
=== modified file 'firewall/firewall_control.c'
--- firewall/firewall_control.c 2010-10-15 15:29:14 +0000
+++ firewall/firewall_control.c 2010-11-30 14:50:30 +0000
@@ -166,8 +166,6 @@
break;
}
out_err:
- if (msg_out) {
- free(msg_out);
- }
+ free(msg_out);
return err;
}
=== modified file 'firewall/lsi.c'
--- firewall/lsi.c 2010-10-24 22:20:24 +0000
+++ firewall/lsi.c 2010-11-30 14:50:30 +0000
@@ -167,9 +167,7 @@
HIP_DEBUG("Send_recv msg succeed \n");
out_err:
- if (msg) {
- free(msg);
- }
+ free(msg);
return err;
}
@@ -287,9 +285,7 @@
}
}
- if (msg) {
- free(msg);
- }
+ free(msg);
return err;
}
=== modified file 'firewall/pisa.c'
--- firewall/pisa.c 2010-10-15 15:29:14 +0000
+++ firewall/pisa.c 2010-11-30 14:50:30 +0000
@@ -298,9 +298,7 @@
HIP_INFO("Certificate successfully verified.\n");
out_err:
- if (buf) {
- free(buf);
- }
+ free(buf);
return err;
}
=== modified file 'firewall/rule_management.c'
--- firewall/rule_management.c 2010-10-15 15:29:14 +0000
+++ firewall/rule_management.c 2010-11-30 14:50:30 +0000
@@ -334,27 +334,13 @@
if (rule) {
HIP_DEBUG("freeing ");
print_rule(rule);
- if (rule->src_hit != NULL) {
- free(rule->src_hit);
- }
- if (rule->dst_hit != NULL) {
- free(rule->dst_hit);
- }
- if (rule->src_hi != NULL) {
- free(rule->src_hi);
- }
- if (rule->type != NULL) {
- free(rule->type);
- }
- if (rule->state != NULL) {
- free(rule->state);
- }
- if (rule->in_if != NULL) {
- free_string_option(rule->in_if);
- }
- if (rule->out_if != NULL) {
- free_string_option(rule->out_if);
- }
+ free(rule->src_hit);
+ free(rule->dst_hit);
+ free(rule->src_hi);
+ free(rule->type);
+ free(rule->state);
+ free_string_option(rule->in_if);
+ free_string_option(rule->out_if);
free(rule);
}
}
=== modified file 'firewall/sysopp.c'
--- firewall/sysopp.c 2010-10-15 15:29:14 +0000
+++ firewall/sysopp.c 2010-11-30 14:50:30 +0000
@@ -103,9 +103,7 @@
-1, "send msg failed\n");
out_err:
- if (msg) {
- free(msg);
- }
+ free(msg);
return err;
}
=== modified file 'firewall/user_ipsec_api.c'
--- firewall/user_ipsec_api.c 2010-10-27 11:27:48 +0000
+++ firewall/user_ipsec_api.c 2010-11-30 14:50:30 +0000
@@ -200,12 +200,8 @@
}
// free the members
- if (esp_packet) {
- free(esp_packet);
- }
- if (decrypted_packet) {
- free(decrypted_packet);
- }
+ free(esp_packet);
+ free(decrypted_packet);
out_err:
return err;
=== modified file 'firewall/user_ipsec_fw_msg.c'
--- firewall/user_ipsec_fw_msg.c 2010-10-15 15:29:14 +0000
+++ firewall/user_ipsec_fw_msg.c 2010-11-30 14:50:30 +0000
@@ -98,9 +98,7 @@
HIP_DEBUG("userspace ipsec activated\n");
out_err:
- if (msg) {
- free(msg);
- }
+ free(msg);
return err;
}
=== modified file 'firewall/user_ipsec_sadb.c'
--- firewall/user_ipsec_sadb.c 2010-11-30 10:35:59 +0000
+++ firewall/user_ipsec_sadb.c 2010-11-30 14:50:30 +0000
@@ -556,12 +556,8 @@
static void hip_sa_entry_free(hip_sa_entry_t *entry)
{
if (entry) {
- if (entry->auth_key) {
- free(entry->auth_key);
- }
- if (entry->enc_key) {
- free(entry->enc_key);
- }
+ free(entry->auth_key);
+ free(entry->enc_key);
// also free all hchain related members
esp_prot_sa_entry_free(entry);
@@ -720,12 +716,8 @@
HIP_ERROR("failed to flush sadb\n");
}
- if (sadb) {
- free(sadb);
- }
- if (linkdb) {
- free(linkdb);
- }
+ free(sadb);
+ free(linkdb);
return err;
}
=== modified file 'hipd/cert.c'
--- hipd/cert.c 2010-10-19 12:08:54 +0000
+++ hipd/cert.c 2010-11-30 14:50:30 +0000
@@ -280,60 +280,30 @@
out_err:
/* free malloced memory */
- if (digest_b64) {
- free(digest_b64);
- }
- if (signature_b64) {
- free(signature_b64);
- }
- if (signature) {
- free(signature);
- }
- if (host_id) {
- free(host_id);
- }
+ free(digest_b64);
+ free(signature_b64);
+ free(signature);
+ free(host_id);
/* RSA pubkey */
- if (e_bin) {
- free(e_bin);
- }
- if (n_bin) {
- free(n_bin);
- }
+ free(e_bin);
+ free(n_bin);
/* encoded */
if (e_hex) {
OPENSSL_free(e_hex);
}
- if (n_b64) {
- free(n_b64);
- }
+ free(n_b64);
/* DSA pubkey */
- if (p_bin) {
- free(p_bin);
- }
- if (q_bin) {
- free(q_bin);
- }
- if (g_bin) {
- free(g_bin);
- }
- if (y_bin) {
- free(y_bin);
- }
+ free(p_bin);
+ free(q_bin);
+ free(g_bin);
+ free(y_bin);
/* encoded */
- if (p_b64) {
- free(p_b64);
- }
- if (q_b64) {
- free(q_b64);
- }
- if (g_b64) {
- free(g_b64);
- }
- if (y_b64) {
- free(y_b64);
- }
+ free(p_b64);
+ free(q_b64);
+ free(g_b64);
+ free(y_b64);
if (dsa_sig) {
DSA_SIG_free(dsa_sig);
@@ -658,30 +628,16 @@
"Failed to build cert_info\n");
out_err:
- if (signature_hash_b64) {
- free(signature_hash_b64);
- }
- if (signature_hash) {
- free(signature_hash);
- }
- if (modulus_b64) {
- free(modulus_b64);
- }
- if (modulus) {
- free(modulus);
- }
- if (cert) {
- free(cert);
- }
+ free(signature_hash_b64);
+ free(signature_hash);
+ free(modulus_b64);
+ free(modulus);
+ free(cert);
+ free(signature);
+ free(e_hex);
if (rsa) {
RSA_free(rsa);
}
- if (signature) {
- free(signature);
- }
- if (e_hex) {
- free(e_hex);
- }
if (dsa) {
DSA_free(dsa);
}
@@ -986,9 +942,7 @@
"Failed to create x509 response parameter\n");
out_err:
- if (host_id) {
- free(host_id);
- }
+ free(host_id);
if (req != NULL) {
X509_REQ_free(req);
}
=== modified file 'hipd/close.c'
--- hipd/close.c 2010-10-22 10:38:11 +0000
+++ hipd/close.c 2010-11-30 14:50:30 +0000
@@ -153,10 +153,7 @@
#endif
out_err:
- if (msg_close) {
- free(msg_close);
- }
-
+ free(msg_close);
return err;
}
@@ -223,12 +220,8 @@
}
out_err:
- if (msg_to_firewall) {
- free(msg_to_firewall);
- }
- if (opaque) {
- free(opaque);
- }
+ free(msg_to_firewall);
+ free(opaque);
return err;
}
=== modified file 'hipd/cookie.c'
--- hipd/cookie.c 2010-11-30 09:48:11 +0000
+++ hipd/cookie.c 2010-11-30 14:50:30 +0000
@@ -224,7 +224,7 @@
err = r1;
out_err:
- if (!err && r1) {
+ if (!err) {
free(r1);
}
@@ -302,9 +302,7 @@
*/
if (hip_r1table) {
for (i = 0; i < HIP_R1TABLESIZE; i++) {
- if (hip_r1table[i].r1) {
- free(hip_r1table[i].r1);
- }
+ free(hip_r1table[i].r1);
}
free(hip_r1table);
hip_r1table = NULL;
=== modified file 'hipd/esp_prot_anchordb.c'
--- hipd/esp_prot_anchordb.c 2010-10-15 15:29:14 +0000
+++ hipd/esp_prot_anchordb.c 2010-11-30 14:50:30 +0000
@@ -88,10 +88,7 @@
anchor_db.hash_item_length[i] = 0;
for (j = 0; j < HCSTORE_MAX_HCHAINS_PER_ITEM; j++) {
- if (anchor_db.anchors[i][j]) {
- free(anchor_db.anchors[i][j]);
- }
-
+ free(anchor_db.anchors[i][j]);
anchor_db.anchors[i][j] = NULL;
}
}
@@ -237,10 +234,7 @@
out_err:
if (err) {
- if (stored_anchor) {
- free(stored_anchor);
- }
-
+ free(stored_anchor);
stored_anchor = NULL;
}
=== modified file 'hipd/esp_prot_hipd_msg.c'
--- hipd/esp_prot_hipd_msg.c 2010-11-30 09:48:11 +0000
+++ hipd/esp_prot_hipd_msg.c 2010-11-30 14:50:30 +0000
@@ -691,10 +691,7 @@
}
out_err:
- if (anchor) {
- free(anchor);
- }
-
+ free(anchor);
return err;
}
@@ -832,10 +829,7 @@
}
out_err:
- if (anchor) {
- free(anchor);
- }
-
+ free(anchor);
return err;
}
=== modified file 'hipd/esp_prot_light_update.c'
--- hipd/esp_prot_light_update.c 2010-11-29 08:58:13 +0000
+++ hipd/esp_prot_light_update.c 2010-11-30 14:50:30 +0000
@@ -199,9 +199,7 @@
entry->light_update_retrans = 1;
}
- if (light_update) {
- free(light_update);
- }
+ free(light_update);
return err;
}
=== modified file 'hipd/hadb.c'
--- hipd/hadb.c 2010-10-27 11:11:20 +0000
+++ hipd/hadb.c 2010-11-30 14:50:30 +0000
@@ -862,12 +862,8 @@
/* Delete SAs */
- if (ha->dh_shared_key) {
- free(ha->dh_shared_key);
- }
- if (ha->hip_msg_retrans.buf) {
- free(ha->hip_msg_retrans.buf);
- }
+ free(ha->dh_shared_key);
+ free(ha->hip_msg_retrans.buf);
if (ha->peer_pub) {
if (hip_get_host_id_algo(ha->peer_pub) == HIP_HI_RSA &&
ha->peer_pub_key) {
@@ -877,21 +873,13 @@
}
free(ha->peer_pub);
}
- if (ha->our_priv) {
- free(ha->our_priv);
- }
- if (ha->our_pub) {
- free(ha->our_pub);
- }
- if (ha->rendezvous_addr) {
- free(ha->rendezvous_addr);
- }
+ free(ha->our_priv);
+ free(ha->our_pub);
+ free(ha->rendezvous_addr);
lmod_uninit_state(ha->hip_modular_state);
- if (ha->locator) {
- free(ha->locator);
- }
+ free(ha->locator);
if (ha->peer_addr_list_to_be_added) {
list_for_each_safe(item, tmp, ha->peer_addr_list_to_be_added, i) {
@@ -1035,10 +1023,8 @@
{
int err = 0, alg = 0;
- if (entry->our_pub != NULL) {
- free(entry->our_pub);
- entry->our_pub = NULL;
- }
+ free(entry->our_pub);
+ entry->our_pub = NULL;
/* Try to fetch our private host identity first using RSA then using DSA.
* Note, that hip_get_host_id() allocates a new buffer and this buffer
@@ -1072,8 +1058,7 @@
}
out_err:
-
- if (err && entry->our_pub) {
+ if (err) {
free(entry->our_pub);
entry->our_pub = NULL;
}
=== modified file 'hipd/hidb.c'
--- hipd/hidb.c 2010-11-30 09:48:11 +0000
+++ hipd/hidb.c 2010-11-30 14:50:30 +0000
@@ -863,10 +863,7 @@
}
out_err:
- if (hi_public) {
- free(hi_public);
- }
-
+ free(hi_public);
return err;
}
=== modified file 'hipd/hipd.c'
--- hipd/hipd.c 2010-11-19 14:46:42 +0000
+++ hipd/hipd.c 2010-11-30 14:50:30 +0000
@@ -429,12 +429,8 @@
/* free allocated resources */
hip_exit();
- if (ctx.input_msg) {
- free(ctx.input_msg);
- }
- if (ctx.output_msg) {
- free(ctx.output_msg);
- }
+ free(ctx.input_msg);
+ free(ctx.output_msg);
HIP_INFO("hipd pid=%d exiting, retval=%d\n", getpid(), err);
=== modified file 'hipd/hiprelay.c'
--- hipd/hiprelay.c 2010-11-15 13:39:24 +0000
+++ hipd/hiprelay.c 2010-11-30 14:50:30 +0000
@@ -54,9 +54,7 @@
* hip_relrec_t rr = hip_relrec_alloc(...);
* hip_relht_put(rr);
* if (hip_relht_get(rr) == NULL) { // The put was unsuccessful.
- * if (rr != NULL) {
- * free(rr);
- * }
+ * free(rr);
* }
* </pre>
* </li>
@@ -1008,10 +1006,7 @@
HIP_DEBUG_HIT("Relayed the packet to", &rec->ip_r);
out_err:
- if (msg_to_be_relayed) {
- free(msg_to_be_relayed);
- }
-
+ free(msg_to_be_relayed);
return err;
}
@@ -1070,9 +1065,7 @@
HIP_DEBUG_HIT("hip_relay_forward_response: Relayed to", relay_to_addr);
out_err:
- if (r_to_be_relayed != NULL) {
- free(r_to_be_relayed);
- }
+ free(r_to_be_relayed);
return err;
}
=== modified file 'hipd/hit_to_ip.c'
--- hipd/hit_to_ip.c 2010-10-15 15:29:14 +0000
+++ hipd/hit_to_ip.c 2010-11-30 14:50:30 +0000
@@ -87,9 +87,7 @@
hip_hit_to_ip_zone = strdup(zone);
- if (tmp != NULL) {
- free(tmp);
- }
+ free(tmp);
}
static const char hex_digits[] = {
=== modified file 'hipd/init.c'
--- hipd/init.c 2010-11-29 08:58:13 +0000
+++ hipd/init.c 2010-11-30 14:50:30 +0000
@@ -615,11 +615,7 @@
hip_hidb_associate_default_hit_lsi(&default_hit, &default_lsi);
out_err:
-
- if (user_msg) {
- free(user_msg);
- }
-
+ free(user_msg);
return err;
}
=== modified file 'hipd/input.c'
--- hipd/input.c 2010-11-30 12:50:51 +0000
+++ hipd/input.c 2010-11-30 14:50:30 +0000
@@ -222,10 +222,7 @@
-1, "HMAC validation failed\n");
out_err:
- if (msg_copy) {
- free(msg_copy);
- }
-
+ free(msg_copy);
return err;
}
@@ -440,15 +437,11 @@
/* on success free for dh_shared_key is called by caller */
out_err:
- if (err && dh_shared_key) {
+ if (err) {
free(dh_shared_key);
}
- if (keymat) {
- free(keymat);
- }
- if (plain_local_hit) {
- free(plain_local_hit);
- }
+ free(keymat);
+ free(plain_local_hit);
return err;
}
@@ -966,9 +959,7 @@
/******************************************************************/
out_err:
- if (ctx->hadb_entry->dh_shared_key) {
- free(ctx->hadb_entry->dh_shared_key);
- }
+ free(ctx->hadb_entry->dh_shared_key);
return err;
}
/**
@@ -1683,9 +1674,7 @@
if (err) {
ctx->error = err;
}
- if (tmp_enc != NULL) {
- free(tmp_enc);
- }
+ free(tmp_enc);
return err;
}
=== modified file 'hipd/keymat.c'
--- hipd/keymat.c 2010-10-15 15:29:14 +0000
+++ hipd/keymat.c 2010-11-30 14:50:30 +0000
@@ -208,9 +208,7 @@
HIP_ERROR("NULL calc_index\n");
}
- if (shabuffer) {
- free(shabuffer);
- }
+ free(shabuffer);
return;
}
=== modified file 'hipd/maintenance.c'
--- hipd/maintenance.c 2010-11-29 08:58:13 +0000
+++ hipd/maintenance.c 2010-11-30 14:50:30 +0000
@@ -416,10 +416,7 @@
HIP_DEBUG("BEX DATA Send to firewall OK.\n");
out_err:
- if (msg) {
- free(msg);
- }
-
+ free(msg);
return err;
}
@@ -451,8 +448,6 @@
HIP_DEBUG("Sent %d bytes to firewall.\n", sent);
out_err:
- if (msg) {
- free(msg);
- }
+ free(msg);
return err;
}
=== modified file 'hipd/nat.c'
--- hipd/nat.c 2010-10-22 10:41:25 +0000
+++ hipd/nat.c 2010-11-30 14:50:30 +0000
@@ -134,10 +134,7 @@
entry, 0);
out_err:
- if (msg) {
- free(msg);
- }
-
+ free(msg);
return err;
}
=== modified file 'hipd/nsupdate.c'
--- hipd/nsupdate.c 2010-10-27 11:27:48 +0000
+++ hipd/nsupdate.c 2010-11-30 14:50:30 +0000
@@ -247,15 +247,9 @@
HIP_DEBUG("Executing %s with %s; %s; %s\n", NSUPDATE_PL, env_hit,
env_ips, env_start);
execve(NSUPDATE_PL, cmd, env);
- if (env_ips) {
- free(env_ips);
- }
- if (env_hit) {
- free(env_hit);
- }
- if (env_start) {
- free(env_start);
- }
+ free(env_ips);
+ free(env_hit);
+ free(env_start);
/* Executed only if error */
HIP_PERROR("execve");
=== modified file 'hipd/oppdb.c'
--- hipd/oppdb.c 2010-11-29 08:58:13 +0000
+++ hipd/oppdb.c 2010-11-30 14:50:30 +0000
@@ -290,9 +290,7 @@
goto out_err;
}
out_err:
- if (message) {
- free(message);
- }
+ free(message);
return err;
}
=== modified file 'hipd/output.c'
--- hipd/output.c 2010-11-29 08:58:13 +0000
+++ hipd/output.c 2010-11-30 14:50:30 +0000
@@ -236,9 +236,7 @@
#endif
out_err:
- if (i1 != NULL) {
- free(i1);
- }
+ free(i1);
return err;
}
@@ -725,26 +723,15 @@
/* Packet ready */
- if (dh_data1) {
- free(dh_data1);
- }
- if (dh_data2) {
- free(dh_data2);
- }
+ free(dh_data1);
+ free(dh_data2);
return msg;
out_err:
- if (msg) {
- free(msg);
- }
- if (dh_data1) {
- free(dh_data1);
- }
- if (dh_data2) {
- free(dh_data2);
- }
-
+ free(msg);
+ free(dh_data1);
+ free(dh_data2);
return NULL;
}
@@ -893,12 +880,8 @@
hip_perf_stop_benchmark(perf_set, PERF_I1);
hip_perf_write_benchmark(perf_set, PERF_I1);
#endif
- if (r1pkt) {
- free(r1pkt);
- }
- if (local_plain_hit) {
- free(local_plain_hit);
- }
+ free(r1pkt);
+ free(local_plain_hit);
return err;
}
=== modified file 'hipd/pisa.c'
--- hipd/pisa.c 2010-10-15 15:29:14 +0000
+++ hipd/pisa.c 2010-11-30 14:50:30 +0000
@@ -55,9 +55,7 @@
{
FILE *f = NULL;
- if (midauth_cert) {
- free(midauth_cert);
- }
+ free(midauth_cert);
midauth_cert = malloc(CERT_MAX_SIZE);
memset(midauth_cert, 0, CERT_MAX_SIZE);
=== modified file 'hipd/registration.c'
--- hipd/registration.c 2010-11-29 08:58:13 +0000
+++ hipd/registration.c 2010-11-30 14:50:30 +0000
@@ -520,9 +520,7 @@
HIP_DEBUG("Registration accepted.\n");
} else { /* The put was unsuccessful. */
- if (new_record != NULL) {
- free(new_record);
- }
+ free(new_record);
refused_requests[*refused_count] = reg_types[i];
failure_types[*refused_count] =
HIP_REG_TRANSIENT_CONDITIONS;
(*refused_count)++;
=== modified file 'hipd/user_ipsec_hipd_msg.c'
--- hipd/user_ipsec_hipd_msg.c 2010-10-15 15:29:14 +0000
+++ hipd/user_ipsec_hipd_msg.c 2010-11-30 14:50:30 +0000
@@ -203,9 +203,7 @@
out_err:
if (err) {
- if (msg) {
- free(msg);
- }
+ free(msg);
msg = NULL;
}
@@ -266,9 +264,7 @@
out_err:
if (err) {
- if (msg) {
- free(msg);
- }
+ free(msg);
msg = NULL;
}
@@ -297,9 +293,7 @@
out_err:
if (err) {
- if (msg) {
- free(msg);
- }
+ free(msg);
msg = NULL;
}
=== modified file 'lib/core/builder.c'
--- lib/core/builder.c 2010-11-29 08:58:13 +0000
+++ lib/core/builder.c 2010-11-30 14:50:30 +0000
@@ -1902,10 +1902,7 @@
err = hip_build_param(msg, &hmac2);
out_err:
- if (msg_copy) {
- free(msg_copy);
- }
-
+ free(msg_copy);
return err;
}
@@ -2029,11 +2026,7 @@
err = hip_build_generic_param(msg, &enc, sizeof(enc), common);
out_err:
-
- if (param_padded) {
- free(param_padded);
- }
-
+ free(param_padded);
return err;
}
@@ -2638,11 +2631,7 @@
value);
out_err:
-
- if (value) {
- free(value);
- }
-
+ free(value);
return err;
}
@@ -3670,11 +3659,7 @@
dsa_key_rr);
out_err:
-
- if (dsa_key_rr) {
- free(dsa_key_rr);
- }
-
+ free(dsa_key_rr);
return err;
}
@@ -3728,11 +3713,7 @@
rsa_key_rr);
out_err:
-
- if (rsa_key_rr) {
- free(rsa_key_rr);
- }
-
+ free(rsa_key_rr);
return err;
}
@@ -3825,17 +3806,9 @@
(is_dsa ? "dsa" : "rsa"));
out_err:
-
- if (key_rr) {
- free(key_rr);
- }
- if (host_id) {
- free(host_id);
- }
- if (host_id_pub) {
- free(host_id_pub);
- }
-
+ free(key_rr);
+ free(host_id);
+ free(host_id_pub);
return err;
}
=== modified file 'lib/core/certtools.c'
--- lib/core/certtools.c 2010-10-18 17:44:31 +0000
+++ lib/core/certtools.c 2010-11-30 14:50:30 +0000
@@ -347,24 +347,14 @@
}
out_err:
- if (signature_hash_b64) {
- free(signature_hash_b64);
- }
- if (signature_hash) {
- free(signature_hash);
- }
- if (modulus_b64) {
- free(modulus_b64);
- }
- if (modulus) {
- free(modulus);
- }
+ free(signature_hash_b64);
+ free(signature_hash);
+ free(modulus_b64);
+ free(modulus);
+ free(e_hex);
if (rsa) {
RSA_free(rsa);
}
- if (e_hex) {
- free(e_hex);
- }
if (dsa) {
DSA_free(dsa);
}
@@ -576,21 +566,11 @@
out_err:
/* free everything malloced */
- if (tmp_before) {
- free(tmp_before);
- }
- if (tmp_after) {
- free(tmp_after);
- }
- if (tmp_issuer) {
- free(tmp_issuer);
- }
- if (tmp_subject) {
- free(tmp_subject);
- }
- if (msg) {
- free(msg);
- }
+ free(tmp_before);
+ free(tmp_after);
+ free(tmp_issuer);
+ free(tmp_subject);
+ free(msg);
return err;
}
@@ -707,9 +687,7 @@
memcpy(to_verification, returned, sizeof(struct hip_cert_spki_info));
out_err:
- if (msg) {
- free(msg);
- }
+ free(msg);
return err;
}
@@ -755,9 +733,7 @@
err = p->der_len;
out_err:
- if (msg) {
- free(msg);
- }
+ free(msg);
return err;
}
@@ -804,9 +780,7 @@
}
out_err:
- if (msg) {
- free(msg);
- }
+ free(msg);
return err;
}
=== modified file 'lib/core/conf.c'
--- lib/core/conf.c 2010-11-06 15:23:19 +0000
+++ lib/core/conf.c 2010-11-30 14:50:30 +0000
@@ -393,9 +393,7 @@
HIP_INFO("All HIs deleted.\n");
out_err:
- if (msg_tmp) {
- free(msg_tmp);
- }
+ free(msg_tmp);
return err;
}
@@ -1046,10 +1044,7 @@
opt[index_of_ip]);
}
out_err:
- if (reg_types) {
- free(reg_types);
- }
-
+ free(reg_types);
return err;
}
@@ -2219,17 +2214,12 @@
strerror(errno));
for (i = 0; i < sizeof(libs) / sizeof(libs[0]); i++) {
- if (libs[i])
- free(libs[i]);
+ free(libs[i]);
}
for (k = 0; 0 < argc; k++) {
- if (argv_new[k]) {
- free(argv_new[k]);
- }
- }
- if (argv_new) {
- free(argv_new);
- }
+ free(argv_new[k]);
+ }
+ free(argv_new);
exit(EXIT_FAILURE);
}
@@ -2704,9 +2694,7 @@
HIP_INFO("User message was sent successfully to the HIP daemon.\n");
out_err:
- if (msg) {
- free(msg);
- }
+ free(msg);
if (err) {
HIP_ERROR("(Check syntax for hipconf. Is hipd running or root
privilege needed?)\n");
=== modified file 'lib/core/crypto.c'
--- lib/core/crypto.c 2010-10-18 17:44:31 +0000
+++ lib/core/crypto.c 2010-11-30 14:50:30 +0000
@@ -455,9 +455,7 @@
err = 0;
out_err:
- if (result) {
- free(result);
- }
+ free(result);
return err;
}
@@ -830,9 +828,7 @@
}
}
- if (pubfilename) {
- free(pubfilename);
- }
+ free(pubfilename);
return err;
}
@@ -934,9 +930,7 @@
}
}
- if (pubfilename) {
- free(pubfilename);
- }
+ free(pubfilename);
return err;
}
=== modified file 'lib/core/filemanip.c'
--- lib/core/filemanip.c 2010-10-18 17:44:31 +0000
+++ lib/core/filemanip.c 2010-11-30 14:50:30 +0000
@@ -190,9 +190,6 @@
chmod(pubfilename, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH);
out_err:
- if (pubfilename) {
- free(pubfilename);
- }
-
+ free(pubfilename);
return;
}
=== modified file 'lib/core/hashchain.c'
--- lib/core/hashchain.c 2010-10-27 11:11:20 +0000
+++ lib/core/hashchain.c 2010-11-30 14:50:30 +0000
@@ -304,10 +304,7 @@
htree_free(hash_chain->link_tree);
hash_chain->link_tree = NULL;
- if (hash_chain->elements) {
- free(hash_chain->elements);
- }
-
+ free(hash_chain->elements);
free(hash_chain);
}
=== modified file 'lib/core/hashtree.c'
--- lib/core/hashtree.c 2010-10-18 17:44:31 +0000
+++ lib/core/hashtree.c 2010-11-30 14:50:30 +0000
@@ -195,15 +195,9 @@
if (tree) {
htree_free(tree->link_tree);
- if (tree->nodes) {
- free(tree->nodes);
- }
- if (tree->data) {
- free(tree->data);
- }
- if (tree->secrets) {
- free(tree->secrets);
- }
+ free(tree->nodes);
+ free(tree->data);
+ free(tree->secrets);
free(tree);
}
=== modified file 'lib/core/hostid.c'
--- lib/core/hostid.c 2010-10-18 17:44:31 +0000
+++ lib/core/hostid.c 2010-11-30 14:50:30 +0000
@@ -141,10 +141,7 @@
set_hit_prefix(hit);
out_err:
- if (khi_data) {
- free(khi_data);
- }
-
+ free(khi_data);
return err;
}
@@ -884,18 +881,10 @@
change_key_file_perms(rsa_filenamebase_pub);
}
- if (dsa_host_id) {
- free(dsa_host_id);
- }
- if (dsa_pub_host_id) {
- free(dsa_pub_host_id);
- }
- if (rsa_host_id) {
- free(rsa_host_id);
- }
- if (rsa_pub_host_id) {
- free(rsa_pub_host_id);
- }
+ free(dsa_host_id);
+ free(dsa_pub_host_id);
+ free(rsa_host_id);
+ free(rsa_pub_host_id);
if (dsa_key) {
DSA_free(dsa_key);
}
@@ -908,42 +897,18 @@
if (rsa_pub_key) {
RSA_free(rsa_pub_key);
}
- if (dsa_key_rr) {
- free(dsa_key_rr);
- }
- if (rsa_key_rr) {
- free(rsa_key_rr);
- }
- if (dsa_pub_key_rr) {
- free(dsa_pub_key_rr);
- }
- if (rsa_pub_key_rr) {
- free(rsa_pub_key_rr);
- }
- if (dsa_filenamebase) {
- free(dsa_filenamebase);
- }
- if (rsa_filenamebase) {
- free(rsa_filenamebase);
- }
- if (dsa_filenamebase_pub) {
- free(dsa_filenamebase_pub);
- }
- if (rsa_filenamebase_pub) {
- free(rsa_filenamebase_pub);
- }
- if (endpoint_dsa_hip) {
- free(endpoint_dsa_hip);
- }
- if (endpoint_rsa_hip) {
- free(endpoint_rsa_hip);
- }
- if (endpoint_dsa_pub_hip) {
- free(endpoint_dsa_pub_hip);
- }
- if (endpoint_rsa_pub_hip) {
- free(endpoint_rsa_pub_hip);
- }
+ free(dsa_key_rr);
+ free(rsa_key_rr);
+ free(dsa_pub_key_rr);
+ free(rsa_pub_key_rr);
+ free(dsa_filenamebase);
+ free(rsa_filenamebase);
+ free(dsa_filenamebase_pub);
+ free(rsa_filenamebase_pub);
+ free(endpoint_dsa_hip);
+ free(endpoint_rsa_hip);
+ free(endpoint_dsa_pub_hip);
+ free(endpoint_rsa_pub_hip);
return err;
}
@@ -1027,9 +992,7 @@
out_err:
if (err) {
- if (*dsa_key_rr) {
- free(*dsa_key_rr);
- }
+ free(*dsa_key_rr);
return err;
} else {
return dsa_key_rr_len;
@@ -1124,9 +1087,7 @@
out_err:
if (err) {
- if (*rsa_key_rr) {
- free(*rsa_key_rr);
- }
+ free(*rsa_key_rr);
return err;
}
=== modified file 'lib/core/message.c'
--- lib/core/message.c 2010-10-18 17:44:31 +0000
+++ lib/core/message.c 2010-11-30 14:50:30 +0000
@@ -172,9 +172,7 @@
bytes += encap_hdr_size;
out_err:
- if (msg != NULL) {
- free(msg);
- }
+ free(msg);
if (err) {
return err;
=== modified file 'lib/core/modularization.c'
--- lib/core/modularization.c 2010-11-15 13:37:13 +0000
+++ lib/core/modularization.c 2010-11-30 14:50:30 +0000
@@ -396,9 +396,7 @@
if (disabled_modules) {
for (i = 0; i < num_disabled_modules; i++) {
- if (disabled_modules[i]) {
- free(disabled_modules[i]);
- }
+ free(disabled_modules[i]);
}
free(disabled_modules);
}
=== modified file 'lib/core/performance.c'
--- lib/core/performance.c 2010-10-18 17:44:31 +0000
+++ lib/core/performance.c 2010-11-30 14:50:30 +0000
@@ -242,10 +242,8 @@
{
int slot = 0;
- if (set->files) {
- free(set->files);
- set->files = NULL;
- }
+ free(set->files);
+ set->files = NULL;
/* Deallocate every slot in set->names.
* You need to do it because every slot memory is allocated
@@ -253,40 +251,26 @@
*/
if (set->names) {
for (slot = 0; slot < PERF_MAX; slot++) {
- if (set->names[slot]) {
- free(set->names[slot]);
- set->names[slot] = NULL;
- }
+ free(set->names[slot]);
+ set->names[slot] = NULL;
}
free(set->names);
set->names = NULL;
}
- if (set->linecount) {
- free(set->linecount);
- set->linecount = NULL;
- }
- if (set->times) {
- free(set->times);
- set->times = NULL;
- }
- if (set->result) {
- free(set->result);
- set->result = NULL;
- }
- if (set->running) {
- free(set->running);
- set->running = NULL;
- }
- if (set->writable) {
- free(set->writable);
- set->writable = NULL;
- }
+ free(set->linecount);
+ set->linecount = NULL;
+ free(set->times);
+ set->times = NULL;
+ free(set->result);
+ set->result = NULL;
+ free(set->running);
+ set->running = NULL;
+ free(set->writable);
+ set->writable = NULL;
- if (set) {
- free(set);
- set = NULL;
- }
+ free(set);
+ set = NULL;
return;
}
=== modified file 'lib/tool/nlink.c'
--- lib/tool/nlink.c 2010-09-20 14:07:02 +0000
+++ lib/tool/nlink.c 2010-11-30 14:50:30 +0000
@@ -877,9 +877,7 @@
out_err:
for (i = 0; i < 16; i++) {
- if (idxmap[i]) {
- free(idxmap[i]);
- }
+ free(idxmap[i]);
}
return 0;
@@ -1224,9 +1222,7 @@
*slash = *aux_slash;
out_err:
- if (aux_slash) {
- free(aux_slash);
- }
+ free(aux_slash);
return err;
}
@@ -1304,9 +1300,7 @@
"netlink talk failed\n");
out_err:
- if (res) {
- free(res);
- }
+ free(res);
return 0;
}
@@ -1407,9 +1401,7 @@
memset(res, '\0', size_dev + 1);
strcat(strcat(res, dev), label);
err = do_chflags(res, flags, mask);
- if (res) {
- free(res);
- }
+ free(res);
}
}
err = do_chflags(dev, flags, mask);
=== modified file 'lib/tool/pk.c'
--- lib/tool/pk.c 2010-11-15 13:38:47 +0000
+++ lib/tool/pk.c 2010-11-30 14:50:30 +0000
@@ -72,9 +72,7 @@
}
out_err:
- if (signature) {
- free(signature);
- }
+ free(signature);
return err;
}
=== modified file 'modules/heartbeat/hipd/heartbeat.c'
--- modules/heartbeat/hipd/heartbeat.c 2010-11-22 18:30:04 +0000
+++ modules/heartbeat/hipd/heartbeat.c 2010-11-30 14:50:30 +0000
@@ -187,9 +187,7 @@
HIP_DEBUG_HIT("Sent heartbeat to", &entry->hit_peer);
out_err:
- if (icmp_pkt) {
- free(icmp_pkt);
- }
+ free(icmp_pkt);
return err;
}
@@ -354,19 +352,10 @@
"Failed to calculate the statistics and store the values\n");
out_err:
-
- if (stval) {
- free(stval);
- }
- if (rtval) {
- free(rtval);
- }
- if (src) {
- free(src);
- }
- if (dst) {
- free(dst);
- }
+ free(stval);
+ free(rtval);
+ free(src);
+ free(dst);
return err;
}
=== modified file 'modules/heartbeat_update/hipd/hb_update.c'
--- modules/heartbeat_update/hipd/hb_update.c 2010-11-22 18:30:04 +0000
+++ modules/heartbeat_update/hipd/hb_update.c 2010-11-30 14:50:30 +0000
@@ -87,10 +87,7 @@
}
out_err:
- if (locator_msg) {
- free(locator_msg);
- }
-
+ free(locator_msg);
return err;
}
=== modified file 'modules/update/hipd/update.c'
--- modules/update/hipd/update.c 2010-11-30 10:48:49 +0000
+++ modules/update/hipd/update.c 2010-11-30 14:50:30 +0000
@@ -576,9 +576,7 @@
}
out_err:
- if (update_packet_to_send) {
- free(update_packet_to_send);
- }
+ free(update_packet_to_send);
return err;
}
@@ -628,9 +626,7 @@
if (hip_locator_status == HIP_MSG_SET_LOCATOR_ON) {
hip_recreate_all_precreated_r1_packets();
}
- if (locator_msg) {
- free(locator_msg);
- }
+ free(locator_msg);
return err;
}
=== modified file 'modules/update/hipd/update_legacy.c'
--- modules/update/hipd/update_legacy.c 2010-11-23 14:50:25 +0000
+++ modules/update/hipd/update_legacy.c 2010-11-30 14:50:30 +0000
@@ -109,11 +109,7 @@
err = hip_build_param_locator(msg, locs, count);
out_err:
-
- if (locs) {
- free(locs);
- }
-
+ free(locs);
return err;
}
=== modified file 'test/certteststub.c'
--- test/certteststub.c 2010-10-15 15:29:14 +0000
+++ test/certteststub.c 2010-11-30 14:50:30 +0000
@@ -193,11 +193,7 @@
out_err:
HIP_DEBUG("If there was no errors above, \"everything\" is OK\n");
- if (cert) {
- free(cert);
- }
- if (to_verification) {
- free(to_verification);
- }
+ free(cert);
+ free(to_verification);
exit(err);
}
=== modified file 'tools/pisacert.c'
--- tools/pisacert.c 2010-10-15 15:29:14 +0000
+++ tools/pisacert.c 2010-11-30 14:50:30 +0000
@@ -70,10 +70,7 @@
memcpy(result, hit, sizeof(struct in6_addr));
out_err:
- if (msg) {
- free(msg);
- }
-
+ free(msg);
return err;
}
Other related posts:
- » [hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5225: Remove unnecessary NULL checks before free() invocations on pointers. - noreply
