cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwUi.cpp : Fix _copy_msg_to_buffer().

Browse Source
This commit is contained in:
kevin 2022-09-10 10:58:30 -04:00
parent 0dbd01d190
commit c0ab1ba53f
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cwUi.cpp
View File

@ -1051,17 +1051,16 @@ namespace cw
rc_t _copy_msg_to_recv_buffer( ui_t* p, const void* msg, unsigned msgByteN ) rc_t _copy_msg_to_recv_buffer( ui_t* p, const void* msg, unsigned msgByteN )
{ {
rc_t rc = kOkRC; if( msg == nullptr || msgByteN == 0)
return kOkRC;
if( p->recvBufIdx + msgByteN > p->recvBufN ) if( p->recvBufIdx + msgByteN > p->recvBufN )
rc = cwLogError(kBufTooSmallRC,"The UI input buffer (%i) is too small.", p->recvBufN); return cwLogError(kBufTooSmallRC,"The UI input buffer (%i) is too small.", p->recvBufN);
else
{
memcpy(p->recvBuf + p->recvBufIdx, msg, msgByteN ); memcpy(p->recvBuf + p->recvBufIdx, msg, msgByteN );
p->recvBufIdx += msgByteN; p->recvBufIdx += msgByteN;
}
return rc; return kOkRC;
} }
const char* _get_msg_from_recv_buffer( ui_t* p ) const char* _get_msg_from_recv_buffer( ui_t* p )
@ -1072,8 +1071,12 @@ namespace cw
// shift off the previous msg // shift off the previous msg
if( p->recvShiftN > 0 ) if( p->recvShiftN > 0 )
{ {
assert( p->recvBufIdx >= p->recvShiftN );
memmove(p->recvBuf, p->recvBuf+p->recvShiftN, p->recvBufIdx - p->recvShiftN ); memmove(p->recvBuf, p->recvBuf+p->recvShiftN, p->recvBufIdx - p->recvShiftN );
p->recvBufIdx -= p->recvShiftN;
p->recvShiftN = 0; p->recvShiftN = 0;
} }
// locate the end of the next msg. // locate the end of the next msg.