fix another crash with invalid SOAP (soap was detached before SOAP up…

…date function ran)
The-Powder-Toy · Nov 22, 2015 · 5be9773 · 5be9773
1 parent 7a78b91
commit 5be9773
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/simulation/elements/SOAP.cpp b/src/simulation/elements/SOAP.cpp
@@ -50,13 +50,13 @@ Element_SOAP::Element_SOAP()
 //#TPT-Directive ElementHeader Element_SOAP static void detach(Simulation * sim, int i)
 void Element_SOAP::detach(Simulation * sim, int i)
 {
-	if ((sim->parts[i].ctype&2) == 2 && sim->parts[sim->parts[i].tmp].type == PT_SOAP)
+	if ((sim->parts[i].ctype&2) == 2 && sim->parts[i].tmp >= 0 && sim->parts[i].tmp < NPART && sim->parts[sim->parts[i].tmp].type == PT_SOAP)
 	{
 		if ((sim->parts[sim->parts[i].tmp].ctype&4) == 4)
 			sim->parts[sim->parts[i].tmp].ctype ^= 4;
 	}
 
-	if ((sim->parts[i].ctype&4) == 4 && sim->parts[sim->parts[i].tmp2].type == PT_SOAP)
+	if ((sim->parts[i].ctype&4) == 4 && sim->parts[i].tmp2 >= 0 && sim->parts[i].tmp2 < NPART && sim->parts[sim->parts[i].tmp2].type == PT_SOAP)
 	{
 		if ((sim->parts[sim->parts[i].tmp2].ctype&2) == 2)
 			sim->parts[sim->parts[i].tmp2].ctype ^= 2;