[colobot] 68/145: Fixed crash when loading level with incorrect object type

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit dd8a324f9b87710280cd4ec2aeaeb6e7e7630917
Author: krzys-h <krzys_h at interia.pl>
Date:   Sun Apr 10 13:27:56 2016 +0200

    Fixed crash when loading level with incorrect object type
---
 src/level/parser/parserparam.cpp | 2 +-
 src/level/parser/parserparam.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/level/parser/parserparam.cpp b/src/level/parser/parserparam.cpp
index 317d388..fb3c82f 100644
--- a/src/level/parser/parserparam.cpp
+++ b/src/level/parser/parserparam.cpp
@@ -530,7 +530,7 @@ ObjectType CLevelParserParam::ToObjectType(std::string value)
     if (value == "Me"                ) return OBJECT_HUMAN;
     if (value == "Tech"              ) return OBJECT_TECH;
     if (value == "MissionController" ) return OBJECT_CONTROLLER;
-    return static_cast<ObjectType>(boost::lexical_cast<int>(value));
+    return static_cast<ObjectType>(Cast<int>(value, "object"));
 }
 
 const std::string CLevelParserParam::FromObjectType(ObjectType value)
diff --git a/src/level/parser/parserparam.h b/src/level/parser/parserparam.h
index f620d84..c72be4f 100644
--- a/src/level/parser/parserparam.h
+++ b/src/level/parser/parserparam.h
@@ -123,7 +123,6 @@ public:
     bool IsDefined();
 
     static const std::string FromObjectType(ObjectType value);
-    static ObjectType ToObjectType(std::string value);
 
 private:
     void ParseArray();
@@ -133,6 +132,7 @@ private:
     template<typename T> T Cast(std::string requestedType);
 
     std::string ToPath(std::string path, const std::string defaultDir);
+    ObjectType ToObjectType(std::string value);
     DriveType ToDriveType(std::string value);
     ToolType ToToolType(std::string value);
     Gfx::WaterType ToWaterType(std::string value);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git