[src/trunk]: src/crypto/dist/ipsec-tools/src/racoon From Ian West <ian%niw.co@localhost...

[tteras <tteras%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1224102666a3
branches:  trunk
changeset: 784659:1224102666a3
user:      tteras <tteras%NetBSD.org@localhost>
date:      Tue Feb 05 06:22:29 2013 +0000

description:
>From Ian West <ian%niw.com.au@localhost>: Fix double free of the radius info on
config reload.

diffstat:

 crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 47093bdcf482 -r 1224102666a3 crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c Tue Feb 05 03:17:50 2013 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c Tue Feb 05 06:22:29 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isakmp_xauth.c,v 1.24 2011/11/15 13:51:23 tteras Exp $ */
+/*     $NetBSD: isakmp_xauth.c,v 1.25 2013/02/05 06:22:29 tteras Exp $ */
 
 /* Id: isakmp_xauth.c,v 1.38 2006/08/22 18:17:17 manubsd Exp */
 
@@ -458,10 +458,14 @@
                        vfree(xauth_rad_config.acct_server_list[i].host);
                        vfree(xauth_rad_config.acct_server_list[i].secret);
                }
-               if (radius_auth_state != NULL)
+               if (radius_auth_state != NULL) {
                        rad_close(radius_auth_state);
-               if (radius_acct_state != NULL)
+                       radius_auth_state = NULL;
+               }
+               if (radius_acct_state != NULL) {
                        rad_close(radius_acct_state);
+                       radius_acct_state = NULL;
+               }
        }
 
        /* initialize radius config */