fix crash when PIPE finds PRTI with an invalid channel

The-Powder-Toy · Nov 29, 2014 · 70a815a · 70a815a
1 parent 6da5b08
commit 70a815a
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/src/simulation/elements/PIPE.cpp b/src/simulation/elements/PIPE.cpp
@@ -454,11 +454,15 @@ void Element_PIPE::pushParticle(Simulation * sim, int i, int count, int original
 				}
 				else if ((r&0xFF) == PT_PRTI) //Pass particles into PRTI for a pipe speed increase
 				{
-					int nnx;
-					for (nnx=0; nnx<80; nnx++)
-						if (!sim->portalp[sim->parts[r>>8].tmp][count][nnx].type)
+					int portaltmp = sim->parts[r>>8].tmp;
+					if (portaltmp >= CHANNELS)
+						portaltmp = CHANNELS-1;
+					else if (portaltmp < 0)
+						portaltmp = 0;
+					for (int nnx = 0; nnx < 80; nnx++)
+						if (!sim->portalp[portaltmp][count][nnx].type)
 						{
-							transfer_pipe_to_part(sim, sim->parts+i, &(sim->portalp[sim->parts[r>>8].tmp][count][nnx]));
+							transfer_pipe_to_part(sim, sim->parts+i, &(sim->portalp[portaltmp][count][nnx]));
 							count++;
 							break;
 						}
@@ -480,11 +484,15 @@ void Element_PIPE::pushParticle(Simulation * sim, int i, int count, int original
 		}
 		else if ((r&0xFF) == PT_PRTI) //Pass particles into PRTI for a pipe speed increase
 		{
-			int nnx;
-			for (nnx=0; nnx<80; nnx++)
-				if (!sim->portalp[sim->parts[r>>8].tmp][count][nnx].type)
+			int portaltmp = sim->parts[r>>8].tmp;
+			if (portaltmp >= CHANNELS)
+				portaltmp = CHANNELS-1;
+			else if (portaltmp < 0)
+				portaltmp = 0;
+			for (int nnx = 0; nnx < 80; nnx++)
+				if (!sim->portalp[portaltmp][count][nnx].type)
 				{
-					transfer_pipe_to_part(sim, sim->parts+i, &(sim->portalp[sim->parts[r>>8].tmp][count][nnx]));
+					transfer_pipe_to_part(sim, sim->parts+i, &(sim->portalp[portaltmp][count][nnx]));
 					count++;
 					break;
 				}