From 2c6dae72e91e67ad537d226dec851ed8d2a32262 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 20:05:36 +0000
Subject: [PATCH] lilypond-0.1.44

---
 flower/string.cc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/flower/string.cc b/flower/string.cc
index 504ba9811b..9f5fca9dad 100644
--- 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);
 }
 
 
-- 
2.39.5