From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Mon, 2 Feb 2015 10:36:14 +0000 (+0100)
Subject: Check for null pointer before applying memwipe()
X-Git-Tag: 5.3.0dr1~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfb708ea2322677a1ac5c4d42b49877dd6c36a59;p=thirdparty%2Fstrongswan.git

Check for null pointer before applying memwipe()
---

diff --git a/src/libstrongswan/plugins/bliss/bliss_private_key.c b/src/libstrongswan/plugins/bliss/bliss_private_key.c
index 64f0b063d6..0f89bed106 100644
--- a/src/libstrongswan/plugins/bliss/bliss_private_key.c
+++ b/src/libstrongswan/plugins/bliss/bliss_private_key.c
@@ -643,10 +643,16 @@ METHOD(private_key_t, destroy, void,
 	if (ref_put(&this->ref))
 	{
 		lib->encoding->clear_cache(lib->encoding, this);
-		memwipe(this->s1, this->set->n * sizeof(int8_t));
-		memwipe(this->s2, this->set->n * sizeof(int8_t));
-		free(this->s1);
-		free(this->s2);
+		if (this->s1)
+		{
+			memwipe(this->s1, this->set->n * sizeof(int8_t));
+			free(this->s1);
+		}
+		if (this->s2)
+		{
+			memwipe(this->s2, this->set->n * sizeof(int8_t));
+			free(this->s2);
+		}
 		free(this->A);
 		free(this);
 	}