games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

Check that resource type set before setName used

Browse Source
This commit is contained in:
ArseniyShestakov
2015-02-06 10:51:32 +03:00
parent 19d1de3142
commit 8f08effe93
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/filesystem/ResourceID.cpp
View File

@ -33,6 +33,7 @@ ResourceID::ResourceID()
} }
ResourceID::ResourceID(std::string name) ResourceID::ResourceID(std::string name)
:type(EResType::UNDEFINED)
{ {
CFileInfo info(std::move(name)); CFileInfo info(std::move(name));
setType(info.getType()); setType(info.getType());
@ -40,6 +41,7 @@ ResourceID::ResourceID(std::string name)
} }
ResourceID::ResourceID(std::string name, EResType::Type type) ResourceID::ResourceID(std::string name, EResType::Type type)
:type(EResType::UNDEFINED)
{ {
setType(type); setType(type);
setName(std::move(name)); setName(std::move(name));
@ -57,6 +59,9 @@ EResType::Type ResourceID::getType() const
void ResourceID::setName(std::string name) void ResourceID::setName(std::string name)
{ {
// setName shouldn't be used if type is UNDEFINED
assert(type != EResType::UNDEFINED);
this->name = std::move(name); this->name = std::move(name);
size_t dotPos = this->name.find_last_of("/."); size_t dotPos = this->name.find_last_of("/.");

3
lib/filesystem/ResourceID.h
View File

@ -56,7 +56,8 @@ namespace EResType
ERM, ERM,
ERT, ERT,
ERS, ERS,
OTHER OTHER,
UNDEFINED
}; };
} }