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

检查索引，否则数组越界

This commit is contained in:
nnhy 2015-11-01 07:13:42 +00:00
parent 3005e494ae
commit 974d5bf93f
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TinyNet/Tiny.cpp
View File

@ -41,7 +41,7 @@ void Setup(ushort code, const char* name, COM_Def message, int baudRate)
} }
sp->Register(OnSerial); sp->Register(OnSerial);
WatchDog::Start(20000); //WatchDog::Start(20000);
#else #else
WatchDog::Start(); WatchDog::Start();
#endif #endif

13
TinyNet/TinyClient.cpp
View File

@ -107,14 +107,14 @@ bool OnClientReceived(Message& msg, void* param)
bool TinyClient::OnReceive(TinyMessage& msg) bool TinyClient::OnReceive(TinyMessage& msg)
{ {
// 不处理来自网关以外的消息 // 不处理来自网关以外的消息
//if(Server == 0 || Server != msg.Dest) return true; //if(Server == 0 || Server != msg.Dest) return true;
//debug_printf("源地址: 0x%08X 网关地址:0x%08X \r\n",Server, msg.Src); //debug_printf("源地址: 0x%08X 网关地址:0x%08X \r\n",Server, msg.Src);
if(Type != 0x01C8) if(Type != 0x01C8)
if(msg.Code != 0x01&& Server != msg.Src) return true;//不是无线中继，不是组网消息。不是被组网网关消息，不受其它消息设备控制. if(msg.Code != 0x01&& Server != msg.Src) return true;//不是无线中继，不是组网消息。不是被组网网关消息，不受其它消息设备控制.
if(msg.Src == Server) LastActive = Time.Current(); if(msg.Src == Server) LastActive = Time.Current();
switch(msg.Code) switch(msg.Code)
@ -274,6 +274,7 @@ bool TinyClient::Report(uint offset, const ByteArray& bs)
void TinyClient::ReportAsync(uint offset) void TinyClient::ReportAsync(uint offset)
{ {
if(this == NULL) return; if(this == NULL) return;
if(offset >= Store.Data.Length()) return;
NextReport = offset; NextReport = offset;
@ -292,7 +293,9 @@ void TinyClientTask(void* param)
assert_param2(offset == 0 || offset < 0x10, "自动上报偏移量异常！"); assert_param2(offset == 0 || offset < 0x10, "自动上报偏移量异常！");
if(offset) if(offset)
{ {
client->Report(offset, client->Store.Data[offset]); // 检查索引，否则数组越界
ByteArray& bs = client->Store.Data;
if(bs.Length() > offset) client->Report(offset, bs[offset]);
client->NextReport = 0; client->NextReport = 0;
return; return;
} }