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

cwSerialPort.cpp : fix bug where the incorrect byte count could be sent on a receive callback.

Browse Source
This commit is contained in:
kpl 2020-03-16 22:54:14 -04:00
parent 14c560a64d
commit 38cf5a0714
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cwSerialPort.cpp
View File

@ -97,9 +97,9 @@ namespace cw
// if attempt to read the port succeeded ... // if attempt to read the port succeeded ...
if((n =read( p->_deviceH, b, bN )) != -1 ) if((n =read( p->_deviceH, b, bN )) != -1 )
{ {
readN_Ref += n; readN_Ref = n;
if( buf == nullptr || bufByteN == 0 ) if( n>0 && p->_cbFunc != nullptr && (buf == nullptr || bufByteN == 0) )
p->_cbFunc( p->_cbArg, p->_userId, b, n ); p->_cbFunc( p->_cbArg, p->_userId, b, n );
} }
@ -159,9 +159,14 @@ namespace cw
// interate through the ports looking for the ones which have data waiting ... // interate through the ports looking for the ones which have data waiting ...
for(unsigned i=0; p!=nullptr; p=p->_link,++i) for(unsigned i=0; p!=nullptr; p=p->_link,++i)
if( p->_pollfd->revents & POLLIN ) if( p->_pollfd->revents & POLLIN )
{
unsigned actualReadN = 0;
// ... then read the data // ... then read the data
if((rc = _receive( d, p, readN_Ref, buf, bufByteN )) != kOkRC ) if((rc = _receive( d, p, actualReadN, buf, bufByteN )) != kOkRC )
return rc; return rc;
readN_Ref += actualReadN;
}
} }