From: Simon Wilkinson <sxw@your-file-system.com>
Date: Sat, 11 Sep 2010 22:14:42 +0000 (+0100)
Subject: auth: Make token_FreeSet work on an empty set
X-Git-Tag: upstream/1.8.0_pre1^2~4830
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=585a0758dfd1c45551cba4d9088d4938422dfcc7;p=packages%2Fo%2Fopenafs.git

auth: Make token_FreeSet work on an empty set

If the set passed to token_FreeSet is already freed, just
make the funciton a no-op, rather than segfaulting.

Change-Id: I41342d1c7bd94bcf20ad67407b28d9ffcccf3c07
Reviewed-on: http://gerrit.openafs.org/2751
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/auth/token.c b/src/auth/token.c
index 4070bb87b..59d323b3d 100644
--- a/src/auth/token.c
+++ b/src/auth/token.c
@@ -429,7 +429,9 @@ token_setPag(struct ktc_setTokenData *jar, int setpag) {
 
 void
 token_FreeSet(struct ktc_setTokenData **jar) {
-    xdr_free((xdrproc_t)xdr_ktc_setTokenData, *jar);
-    memset(*jar, 0, sizeof(struct ktc_setTokenData));
-    *jar = NULL;
+    if (*jar) {
+	xdr_free((xdrproc_t)xdr_ktc_setTokenData, *jar);
+	memset(*jar, 0, sizeof(struct ktc_setTokenData));
+	*jar = NULL;
+    }
 }