From 7351da3962afed0c46391372373238fdf6e8347c Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Sat, 25 Jun 2011 22:44:07 +0100 Subject: [PATCH] Fix segfault with aray striking particles with abnormal ctype --- src/elements/aray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/elements/aray.c b/src/elements/aray.c index b1a2e9124..9604fba80 100644 --- a/src/elements/aray.c +++ b/src/elements/aray.c @@ -50,7 +50,7 @@ int update_ARAY(UPDATE_FUNC_ARGS) { create_part(-1, x+nxi+nxx, y+nyi+nyy, PT_SPRK); } //if (!(nostop && (ptypes[r&0xFF].properties&PROP_CONDUCTS))) {//don't need to check r&0xFF>8)>=NPART //Not sure why you changed checking "ctype" to "type" - if (!(nostop && (ptypes[parts[r>>8].ctype].properties&PROP_CONDUCTS))) { + if (!(nostop && parts[r>>8].ctype >= 0 && parts[r>>8].ctype < PT_NUM && (ptypes[parts[r>>8].ctype].properties&PROP_CONDUCTS))) { docontinue = 0; } else { docontinue = 1;