Fix the issue with 2 consecutive tests and deallocation.

hpfem · Jan 27, 2014 · 910c803 · 910c803
1 parent a63faf0
commit 910c803
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/hermes2d/src/mesh/curved.cpp b/hermes2d/src/mesh/curved.cpp
@@ -275,13 +275,19 @@ namespace Hermes
 
     void Nurbs::unref()
     {
-      if (!--this->ref)
-      {
-        delete[] pt;
-        pt = nullptr;
-        delete[] kv;
-        kv = nullptr;
-      }
+        if (!--this->ref)
+        {
+            if(pt)
+            {
+                delete[] pt;
+                pt = nullptr;
+            }
+            if(kv)
+            {
+                delete[] kv;
+                kv = nullptr;
+            }
+        }
     }
 
     static double lambda_0(double x, double y)
@@ -332,7 +338,10 @@ namespace Hermes
         {
           nurbs[i]->unref();
           if (nurbs[i]->ref <= 0)
+          {
             delete nurbs[i];
+            nurbs[i] = nullptr;
+          }
         }
       }
     }