lilypond-0.1.44

diff --git a/flower/string.cc b/flower/string.cc
index 504ba9811be61876f4e24226512138f2c83ad28a..9f5fca9dad2178726f8cc34ce18f7294369aef5d 100644 (file)
--- a/flower/string.cc
+++ b/flower/string.cc
@@ -155,11 +155,12 @@ String::compare_i (String const& s1, String const& s2)
   if (p1 == p2)
     return 0;
 
-  int i1 = s1.length_i();
-  int i2 = s2.length_i();
-
-  int result=  memcmp (p1, p2, i1 <? i2);
-  return result ? result : i1-i2;
+  /*
+    don't forget the terminating '\0'
+   */
+  int f = (s1.length_i() <? s2.length_i());
+  int cmp_length = 1+ f;
+  return memcmp (p1, p2, cmp_length);
 }
 
 \f