From: Joe Neeman <joeneeman@gmail.com>
Date: Thu, 26 Aug 2010 23:18:14 +0000 (-0700)
Subject: Use signed arithmetic to avoid overflow.
X-Git-Tag: release/2.13.32-1~22
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=af3aa113a3f88c48b6449946a18501e2d333285d;p=lilypond.git

Use signed arithmetic to avoid overflow.
---

diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index 88f55b896c..543665f97b 100644
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -851,17 +851,17 @@ Page_breaking::line_divisions_rec (vsize system_count,
 				   Line_division *cur_division)
 {
   vsize my_index = cur_division->size ();
-  vsize others_min = 0;
-  vsize others_max = 0;
+  int others_min = 0;
+  int others_max = 0;
 
   for (vsize i = my_index + 1; i < min_sys.size (); i++)
     {
       others_min += min_sys[i];
       others_max += max_sys[i];
     }
-  others_max = min (others_max, system_count);
-  vsize real_min = max (min_sys[my_index], system_count - others_max);
-  vsize real_max = min (max_sys[my_index], system_count - others_min);
+  others_max = min (others_max, (int) system_count);
+  int real_min = max ((int) min_sys[my_index], (int) system_count - others_max);
+  int real_max = min ((int) max_sys[my_index], (int) system_count - others_min);
 
   if (real_min > real_max || real_min <= 0)
     {
@@ -872,7 +872,7 @@ Page_breaking::line_divisions_rec (vsize system_count,
       return;
     }
 
-  for (vsize i = real_min; i <= real_max; i++)
+  for (int i = real_min; i <= real_max; i++)
     {
       cur_division->push_back (i);
       if (my_index == min_sys.size () - 1)