From 0f0b921714a32b51a1bbda1848a356bb4553f3d3 Mon Sep 17 00:00:00 2001
From: Cristian Cadar <cristic@cs.stanford.edu>
Date: Mon, 24 Aug 2009 21:42:34 +0000
Subject: Applied the patch submitted by Robby Cochran that fixes an arithmetic
 overflow in Solver::getRange().

git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@79945 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Solver/Solver.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/Solver/Solver.cpp b/lib/Solver/Solver.cpp
index abe88db7..5dd24273 100644
--- a/lib/Solver/Solver.cpp
+++ b/lib/Solver/Solver.cpp
@@ -164,7 +164,7 @@ std::pair< ref<Expr>, ref<Expr> > Solver::getRange(const Query& query) {
     // binary search for # of useful bits
     uint64_t lo=0, hi=width, mid, bits=0;
     while (lo<hi) {
-      mid = (lo+hi)/2;
+      mid = lo + (hi - lo)/2;
       bool res;
       bool success = 
         mustBeTrue(query.withExpr(
@@ -205,7 +205,7 @@ std::pair< ref<Expr>, ref<Expr> > Solver::getRange(const Query& query) {
       // binary search for min
       lo=0, hi=bits64::maxValueOfNBits(bits);
       while (lo<hi) {
-        mid = (lo+hi)/2;
+        mid = lo + (hi - lo)/2;
         bool res = false;
         bool success = 
           mayBeTrue(query.withExpr(UleExpr::create(e, 
@@ -229,7 +229,7 @@ std::pair< ref<Expr>, ref<Expr> > Solver::getRange(const Query& query) {
     // binary search for max
     lo=min, hi=bits64::maxValueOfNBits(bits);
     while (lo<hi) {
-      mid = (lo+hi)/2;
+      mid = lo + (hi - lo)/2;
       bool res;
       bool success = 
         mustBeTrue(query.withExpr(UleExpr::create(e, 
-- 
cgit 1.4.1