Changeset 794

Timestamp:

05/31/18 03:23:05 (6 years ago)

Author:

Maciej Komosinski

Message:

Protected against overflow when converting floating point value to integer value

File:

• cpp/frams/util/extvalue.cpp (modified) (1 diff)

cpp/frams/util/extvalue.cpp

@@ -945 +945 @@
         {
         case TInt: return idata();
-        case TDouble: return (int)ddata();
+        case TDouble:
+        {
+                bool toobig = false;
+                if (((toobig = (ddata() > (double)INT_MAX)))
+                        || (ddata() < (double)INT_MIN))
+                {
+                        logPrintf("ExtValue", "getInt", LOG_ERROR, "Overflow when converting floating point value to integer; using %s allowed integer '%d' instead of '%s'", toobig ? "maximal" : "minimal", toobig ? INT_MAX : INT_MIN, getString().c_str());
+                        return toobig ? INT_MAX : INT_MIN;
+                }
+                return (int)ddata();
+        }
         case TString: return getInt(sdata().c_str());
         case TObj: