[Avida-SVN] r3041 - development/source/main

[beckma24 at myxo.css.msu.edu]

Author: beckma24
Date: 2008-12-15 00:34:54 -0500 (Mon, 15 Dec 2008)
New Revision: 3041

Modified:
   development/source/main/cPopulation.cc
Log:
Protecting against any attempt to access a deleted object, e.g. cur_org

Modified: development/source/main/cPopulation.cc
===================================================================
--- development/source/main/cPopulation.cc	2008-12-15 05:08:18 UTC (rev 3040)
+++ development/source/main/cPopulation.cc	2008-12-15 05:34:54 UTC (rev 3041)
@@ -3536,7 +3536,10 @@
   cell.GetHardware()->SingleProcess(ctx);    
   
   double merit = cur_org->GetPhenotype().GetMerit().GetDouble();
-  if (cur_org->GetPhenotype().GetToDelete() == true) delete cur_org;
+  if (cur_org->GetPhenotype().GetToDelete() == true) {
+		delete cur_org;
+		cur_org = NULL;
+	}
   
   m_world->GetStats().IncExecuted();
   resource_count.Update(step_size);
@@ -3585,7 +3588,10 @@
     }
   }
   
-  if (cur_org->GetPhenotype().GetToDelete() == true) delete cur_org;
+  if (cur_org->GetPhenotype().GetToDelete() == true) {
+		delete cur_org;
+		cur_org = NULL;
+	}
   
   m_world->GetStats().IncExecuted();
   resource_count.Update(step_size);