Added nullptr check in Ctxt destructor

vernamlab · Jul 12, 2018 · 150468b · 150468b
1 parent ec47abb
commit 150468b
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/cufhe/lib/cufhe.cc b/cufhe/lib/cufhe.cc
@@ -279,17 +279,23 @@ PubKey::~PubKey() {
 }
 
 Ctxt::~Ctxt() {
-  lwe_sample_deleter_(lwe_sample_->data());
-  lwe_sample_deleter_ = nullptr;
-  lwe_sample_->set_data(nullptr);
-  delete lwe_sample_;
-  lwe_sample_ = nullptr;
-
-  lwe_sample_device_deleter_(lwe_sample_device_->data());
-  lwe_sample_device_deleter_ = nullptr;
-  lwe_sample_device_->set_data(nullptr);
-  delete lwe_sample_device_;
-  lwe_sample_device_ = nullptr;
+  if(lwe_sample_ != nullptr)
+  {
+    lwe_sample_deleter_(lwe_sample_->data());
+    lwe_sample_deleter_ = nullptr;
+    lwe_sample_->set_data(nullptr);
+    delete lwe_sample_;
+    lwe_sample_ = nullptr;
+  }
+
+  if(lwe_sample_device_ != nullptr)
+  {
+    lwe_sample_device_deleter_(lwe_sample_device_->data());
+    lwe_sample_device_deleter_ = nullptr;
+    lwe_sample_device_->set_data(nullptr);
+    delete lwe_sample_device_;
+    lwe_sample_device_ = nullptr;
+  }
 }
 
 void SetSeed(uint32_t seed) {