openharmony/developtools_hdc
1
0
Fork 0
mirror of https://gitee.com/openharmony/developtools_hdc synced 2024-11-27 09:11:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1635 feat:bugfix for crash

Browse Source 
Merge pull request !1635 from maliang/master
This commit is contained in:
openharmony_ci 2024-10-31 03:41:06 +00:00 committed by Gitee
commit c309f6ed46
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/session.cpp
View File

@ -832,7 +832,7 @@ int HdcSessionBase::Send(const uint32_t sessionId, const uint32_t channelId, con
const uint8_t *data, const int dataSize)
{
StartTraceScope("HdcSessionBase::Send");
HSession hSession = AdminSession(OP_QUERY, sessionId, nullptr);
HSession hSession = AdminSession(OP_QUERY_REF, sessionId, nullptr);
if (!hSession) {
WRITE_LOG(LOG_WARN, "Send to offline device, drop it, sessionId:%u", sessionId);
return ERR_SESSION_NOFOUND;
@ -856,6 +856,7 @@ int HdcSessionBase::Send(const uint32_t sessionId, const uint32_t channelId, con
uint8_t *finayBuf = new(std::nothrow) uint8_t[finalBufSize]();
if (finayBuf == nullptr) {
WRITE_LOG(LOG_WARN, "send allocmem err");
--hSession->ref;
return ERR_BUF_ALLOC;
}
bool bufRet = false;
@ -878,13 +879,17 @@ int HdcSessionBase::Send(const uint32_t sessionId, const uint32_t channelId, con
if (!bufRet) {
delete[] finayBuf;
WRITE_LOG(LOG_WARN, "send copywholedata err for dataSize:%d", dataSize);
--hSession->ref;
return ERR_BUF_COPY;
}
int ret = -1;
if (CMD_KERNEL_ECHO == commandFlag) {
return SendByProtocol(hSession, finayBuf, finalBufSize, true);
ret = SendByProtocol(hSession, finayBuf, finalBufSize, true);
} else {
return SendByProtocol(hSession, finayBuf, finalBufSize);
ret = SendByProtocol(hSession, finayBuf, finalBufSize);
}
--hSession->ref;
return ret;
}
int HdcSessionBase::DecryptPayload(HSession hSession, PayloadHead *payloadHeadBe, uint8_t *encBuf)