
vpnc at unix-ag
Jun 21, 2009, 2:35 AM
Post #1 of 1
(661 views)
Permalink
|
|
svn commit: vpnc r410 - /branches/vpnc-nortel/vpnc.c
|
|
Author: Antonio Borneo Date: Sun Jun 21 11:35:52 2009 New Revision: 410 Log: Merge in Nortel branch the commit r341 by Joerg Mayer. Original comment: Fix a few style warnings found with cppcheck (free works on NULL pointers) Modified: branches/vpnc-nortel/vpnc.c Modified: branches/vpnc-nortel/vpnc.c ============================================================================== --- branches/vpnc-nortel/vpnc.c (original) +++ branches/vpnc-nortel/vpnc.c Sun Jun 21 11:35:52 2009 @@ -201,8 +201,7 @@ setenv(name, strbuf ? strbuf : value, 1); - if (strbuf) - free(strbuf); + free(strbuf); } static void addenv_ipv4(const void *name, uint8_t * data) @@ -3183,10 +3182,9 @@ if (reject == 0 && r->payload->next->type != ISAKMP_PAYLOAD_SA) reject = ISAKMP_N_INVALID_PAYLOAD_TYPE; - if (p_flat) - free(p_flat); - if (realiv) - free(realiv); + free(p_flat); + free(realiv); + break; } @@ -3392,8 +3390,7 @@ if (dh_grp) group_free(dh_grp); - if (dh_shared_secret) - free(dh_shared_secret); + free(dh_shared_secret); free_isakmp_packet(r); } @@ -3423,7 +3420,7 @@ s->ipsec.rx.seq_id = s->ipsec.tx.seq_id = 1; } - if (dh_public) free(dh_public); + free(dh_public); } static void send_delete_ipsec(struct sa_block *s) _______________________________________________ vpnc-devel mailing list vpnc-devel [at] unix-ag https://lists.unix-ag.uni-kl.de/mailman/listinfo/vpnc-devel http://www.unix-ag.uni-kl.de/~massar/vpnc/
|