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 64f0b063d6e82ecfc170f75c2168c19e9f3cb85c..0f89bed106e640535c580f61e2d1d2006a105fc6 100644 (file)
--- 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);
        }