2 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/FreezeScript/AssignVisitor.cpp b/cpp/src/FreezeScript/AssignVisitor.cpp
index 1037e6e96a3..ec1fb7ea5da 100644
--- a/cpp/src/FreezeScript/AssignVisitor.cpp
+++ b/cpp/src/FreezeScript/AssignVisitor.cpp
@@ -162,7 +162,8 @@ FreezeScript::AssignVisitor::visitEnum(const EnumDataPtr& dest)
     {
         if(_convert)
         {
-            if(!dest->setValue(i->integerValue()))
+            Ice::Long l = i->integerValue();
+            if(l < 0 || l > INT_MAX || !dest->setValue(static_cast<Ice::Int>(l)))
             {
                 rangeError(i->toString(), type);
             }
diff --git a/cpp/src/FreezeScript/TransformDescriptors.cpp b/cpp/src/FreezeScript/TransformDescriptors.cpp
index 8416887975a..ad6cdacbced 100644
--- a/cpp/src/FreezeScript/TransformDescriptors.cpp
+++ b/cpp/src/FreezeScript/TransformDescriptors.cpp
@@ -2058,8 +2058,8 @@ FreezeScript::SymbolTableI::EntityVisitor::getCurrent() const
 //
 // ObjectVisitor
 //
-FreezeScript::ObjectVisitor::ObjectVisitor(ObjectDataMap& map) :
-    _map(map)
+FreezeScript::ObjectVisitor::ObjectVisitor(ObjectDataMap& objectDataMap) :
+    _map(objectDataMap)
 {
 }