[src/ipsec-tools-0_8-branch]: src/crypto/dist/ipsec-tools/src/racoon From Ian...

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

details:   https://anonhg.NetBSD.org/src/rev/f60d15c0985f
branches:  ipsec-tools-0_8-branch
changeset: 763339:f60d15c0985f
user:      tteras <tteras%NetBSD.org@localhost>
date:      Tue Feb 05 06:23:42 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 97807b49428c -r f60d15c0985f crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c Thu Jan 24 06:48:27 2013 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c Tue Feb 05 06:23:42 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isakmp_xauth.c,v 1.22 2011/03/14 15:50:36 vanhu Exp $  */
+/*     $NetBSD: isakmp_xauth.c,v 1.22.2.1 2013/02/05 06:23:42 tteras Exp $     */
 
 /* Id: isakmp_xauth.c,v 1.38 2006/08/22 18:17:17 manubsd Exp */
 
@@ -461,10 +461,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 */