From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Fri, 24 Aug 2012 13:06:30 +0000 (+0200)
Subject: ir_value_life_merge_into: fix a possible underflow
X-Git-Tag: 0.1-rc1~55
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f042068aab125f202a89108411cb0cbaa5486335;p=xonotic%2Fgmqcc.git

ir_value_life_merge_into: fix a possible underflow
---

diff --git a/ir.c b/ir.c
index d2e1e0f..0be4d05 100644
--- a/ir.c
+++ b/ir.c
@@ -925,8 +925,8 @@ bool ir_value_life_merge_into(ir_value *self, const ir_value *other)
                 entry->start = life->start;
             }
 
-            if (life->end     >  entry->end &&
-                life->start-1 <= entry->end)
+            if (life->end   >  entry->end &&
+                life->start <= entry->end+1)
             {
                 /* ends later and overlaps */
                 entry->end = life->end;