DO REPEAT: Avoid relying on null terminators.

[pspp] / src / language / control / do-if.c

diff --git a/src/language/control/do-if.c b/src/language/control/do-if.c
index a44f6e81896f2efb528eeb6c01e20f944c62f4d0..83de0e39a31a73574bfe0fa0b781dafc96eafbf0 100644 (file)
--- a/src/language/control/do-if.c
+++ b/src/language/control/do-if.c
@@ -124,9 +124,12 @@ int
 cmd_else (struct lexer *lexer UNUSED, struct dataset *ds)
 {
   struct do_if_trns *do_if = ctl_stack_top (&do_if_class);
-  assert (ds == do_if->ds);
+
   if (do_if == NULL || !must_not_have_else (do_if))
     return CMD_CASCADING_FAILURE;
+
+  assert (ds == do_if->ds);
+
   add_else (do_if);
   return CMD_SUCCESS;
 }
@@ -174,7 +177,7 @@ must_not_have_else (struct do_if_trns *do_if)
 {
   if (has_else (do_if))
     {
-      msg (SE, _("This command may not follow ELSE in DO IF...END IF."));
+      msg (SE, _("This command may not follow %s in %s ... %s."), "ELSE", "DO IF", "END IF");
       return false;
     }
   else