From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 9 Jan 2011 01:52:14 +0000 (+0000)
Subject: realtime: movpos: do not SEGV if we dispose a half-built indep
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=d641b40f50a936293c8b5b3f7b234af39b1cc19c;p=trains.git

realtime: movpos: do not SEGV if we dispose a half-built indep
---

diff --git a/hostside/movpos.c b/hostside/movpos.c
index 4ce78c7..9c0cc75 100644
--- a/hostside/movpos.c
+++ b/hostside/movpos.c
@@ -771,12 +771,12 @@ static void indep_dispose(MovPosChange *indep) {
   int changei;
   for (changei=0; changei<indep->n_changes; changei++) {
       Change *chg= indep->changes[changei];
+      if (!chg) continue;
+
       Method *meth= chg->meth;
-      if (chg) {
-	DPRINTF(movpos,meth, METH_DPFX_FMT "dispose...\n",
-		METH_DPFX_ARGS(indep,*meth));
-	meth->dispose(meth, chg);
-      }
+      DPRINTF(movpos,meth, METH_DPFX_FMT "dispose...\n",
+	      METH_DPFX_ARGS(indep,*meth));
+      meth->dispose(meth, chg);
   }
   free(indep);
 }