提交 7edc86fe 编写于 作者: 丁劲犇's avatar 丁劲犇 😸

a bug caused by m_currentBlock.constData() has been fixed. the pointer...

a bug caused by m_currentBlock.constData() has been fixed. the pointer returned by this method will be unavaliable when the block has been changed.
上级 6d8e4f50
...@@ -335,7 +335,7 @@ int MainDialog::filter_message(QByteArray block, int offset) ...@@ -335,7 +335,7 @@ int MainDialog::filter_message(QByteArray block, int offset)
memcpy((void *)&m_currentHeader,headerptr,2); memcpy((void *)&m_currentHeader,headerptr,2);
} }
const char * ptrCurrData = m_currentBlock.constData();
//Heart Beating //Heart Beating
if (m_currentHeader.Mark == 0xBEBE) if (m_currentHeader.Mark == 0xBEBE)
{ {
...@@ -416,6 +416,7 @@ int MainDialog::filter_message(QByteArray block, int offset) ...@@ -416,6 +416,7 @@ int MainDialog::filter_message(QByteArray block, int offset)
} //end deal trans message } //end deal trans message
else else
{ {
const char * ptrCurrData = m_currentBlock.constData();
displayMessage(tr("Client Send a unknown start Header %1 %2. Close client immediately.") displayMessage(tr("Client Send a unknown start Header %1 %2. Close client immediately.")
.arg((int)(ptrCurrData[0])).arg((int)(ptrCurrData[1]))); .arg((int)(ptrCurrData[0])).arg((int)(ptrCurrData[1])));
m_currentMessageSize = 0; m_currentMessageSize = 0;
......
...@@ -136,7 +136,7 @@ namespace ZP_Cluster{ ...@@ -136,7 +136,7 @@ namespace ZP_Cluster{
memcpy((void *)&m_currentHeader,headerptr,2); memcpy((void *)&m_currentHeader,headerptr,2);
} }
const char * ptrCurrData = m_currentBlock.constData();
if (m_currentHeader.Mark == 0x1234) if (m_currentHeader.Mark == 0x1234)
//Valid Message //Valid Message
{ {
...@@ -225,6 +225,7 @@ namespace ZP_Cluster{ ...@@ -225,6 +225,7 @@ namespace ZP_Cluster{
} //end deal trans message } //end deal trans message
else else
{ {
const char * ptrCurrData = m_currentBlock.constData();
emit evt_Message(this,tr("Client Send a unknown start Header %1 %2. Close client immediately.") emit evt_Message(this,tr("Client Send a unknown start Header %1 %2. Close client immediately.")
.arg((int)(ptrCurrData[0])).arg((int)(ptrCurrData[1]))); .arg((int)(ptrCurrData[0])).arg((int)(ptrCurrData[1])));
m_currentMessageSize = 0; m_currentMessageSize = 0;
......
...@@ -128,7 +128,7 @@ namespace ExampleServer{ ...@@ -128,7 +128,7 @@ namespace ExampleServer{
memcpy((void *)&m_currentHeader,headerptr,2); memcpy((void *)&m_currentHeader,headerptr,2);
} }
const char * ptrCurrData = m_currentBlock.constData();
//Heart Beating //Heart Beating
if (m_currentHeader.Mark == 0xBEBE) if (m_currentHeader.Mark == 0xBEBE)
{ {
...@@ -148,7 +148,7 @@ namespace ExampleServer{ ...@@ -148,7 +148,7 @@ namespace ExampleServer{
//Try to Get UUID Immediately //Try to Get UUID Immediately
if (m_bUUIDRecieved==false) if (m_bUUIDRecieved==false)
{ {
EXAMPLE_HEARTBEATING * pHbMsg = (EXAMPLE_HEARTBEATING *)(ptrCurrData); EXAMPLE_HEARTBEATING * pHbMsg = (EXAMPLE_HEARTBEATING *)(m_currentBlock.constData());
if (bIsValidUserId(pHbMsg->source_id)) if (bIsValidUserId(pHbMsg->source_id))
{ {
m_bUUIDRecieved = true; m_bUUIDRecieved = true;
...@@ -236,6 +236,7 @@ namespace ExampleServer{ ...@@ -236,6 +236,7 @@ namespace ExampleServer{
} //end deal trans message } //end deal trans message
else else
{ {
const char * ptrCurrData = m_currentBlock.constData();
emit evt_Message(this,tr("Client Send a unknown start Header %1 %2. Close client immediately.") emit evt_Message(this,tr("Client Send a unknown start Header %1 %2. Close client immediately.")
.arg((int)(ptrCurrData[0])).arg((int)(ptrCurrData[1]))); .arg((int)(ptrCurrData[0])).arg((int)(ptrCurrData[1])));
m_currentMessageSize = 0; m_currentMessageSize = 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册