Fix infinite loop in Completion_heads_engraver at invalid measure position (issue...

* Completion_heads_engraver now gives a programming_error instead of trying to make negative-duration notes.
* intlog2 with a nonpositive argument now gives an error instead of an infinite loop.

diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc
index 5775ef188a17e8bbd2cd3ab45c001115a1782d77..4192b58be1a9f12696aa2faa8b9f284bdf0e5445 100644 (file)
--- a/lily/completion-note-heads-engraver.cc
+++ b/lily/completion-note-heads-engraver.cc
@@ -117,6 +117,12 @@ Completion_heads_engraver::next_moment (Rational const &note_len)
     }
 
   Moment result = *l - *e;
+  if (result < 0)
+    {
+      programming_error ("invalid measure position: "
+                         + e->to_string () + " of " + l->to_string ());
+      return 0;
+    }
   Moment const *unit = unsmob_moment (get_property ("completionUnit"));
 
   if (unit)

diff --git a/lily/misc.cc b/lily/misc.cc
index f104f98baa7be06dc611011d5995d97bddb72fb5..2adc250481b978bf75a196955787bd3fbca7d852 100644 (file)
--- a/lily/misc.cc
+++ b/lily/misc.cc
@@ -30,7 +30,8 @@
 int
 intlog2 (int d)
 {
-  assert (d);
+  if (d <= 0)
+    error ("intlog2 with negative argument: " + to_string (d));
   int i = 0;
   while ((d != 1))
     {