NewLife
/
SmartOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

使用断言判断，让太长的配置区名称失败

This commit is contained in:
nnhy 2016-03-17 06:17:17 +00:00
parent fcfe40aa09
commit 6037f1d77a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Config.cpp
View File

@ -76,6 +76,8 @@ uint ConfigBlock::CopyTo(Buffer& bs) const
bool ConfigBlock::Init(const String& name, const Buffer& bs)
{
if(!name) return false;
assert_param2(name.Length() < sizeof(Name), "配置区名称太长");
if(name.Length() >= sizeof(Name)) return false;
TS("ConfigBlock::Init");
@ -164,6 +166,8 @@ const ConfigBlock* FindBlock(const Storage& st, uint addr, const String& name)
TS("Config::Find");
if(!name) return nullptr;
assert_param2(name.Length() < sizeof(ConfigBlock::Name), "配置区名称太长");
if(name.Length() >= sizeof(ConfigBlock::Name)) return nullptr;
if(!CheckSignature(st, addr, false)) return nullptr;
@ -250,6 +254,7 @@ const void* Config::Set(const String& name, const Buffer& bs) const
if(!name) return nullptr;
assert_param2(name.Length() < sizeof(ConfigBlock::Name), "配置区名称太长");
if(name.Length() >= sizeof(ConfigBlock::Name)) return nullptr;
auto cfg = FindBlock(Device, Address, name);