Prevent access beyond boundaries of array on fallthrough

diff --git a/main.c b/main.c
index 0b3663940c05c75d82b28918742a752864c3067c..200c77ebc3d0bf4a541e3c206e6571a2a8d74f80 100644 (file)
--- a/main.c
+++ b/main.c
@@ -648,8 +648,8 @@ static void playermove( int motion)
                         /* else fall through */
                     }
                     /* YAML [with OBJ] clause */
                         /* else fall through */
                     }
                     /* YAML [with OBJ] clause */

-                    if (TOTING(condarg1) ||
-                        (condtype == cond_with && AT(condarg1)))
+                    else if (TOTING(condarg1) ||
+                             (condtype == cond_with && AT(condarg1)))

                         break;
                     /* else fall through to check [not OBJ STATE] */
                 } else if (game.prop[condarg1] != condarg2)
                         break;
                     /* else fall through to check [not OBJ STATE] */
                 } else if (game.prop[condarg1] != condarg2)