jens/cpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Instead of adjusted len, buffer read() / write() returns exception in case of length mismatch

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/libsrc/cpp@1027 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2022-06-17 12:08:06 +00:00
parent 9ee9bc989f
commit 0157bad8d8
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/processor/src/Buffer.hpp
+2 -2
View File
@@ -61,8 +61,8 @@ class Buffer : public IBuffer
T* data_w(); T* data_w();
T* data_r(); T* data_r();
size_t write(const T* pData, size_t len); Result write(const T* pData, size_t len);
size_t read(T* pData, size_t len); Result read(T* pData, size_t len);
T readAt(size_t offset); T readAt(size_t offset);
Result consume(size_t len); Result consume(size_t len);
Result produce(size_t len); Result produce(size_t len);
radio/processor/src/Buffer.tcc
+14 -16
View File
@@ -94,35 +94,35 @@ T* Buffer<T>::data_r()
} }
template<typename T> template<typename T>
size_t Buffer<T>::write(const T *pData, size_t len) typename Buffer<T>::Result Buffer<T>::write(const T *pData, size_t len)
{ {
len = std::min(free(), len); if (len > free())
size_t numWritten = 0;
if (len == 0)
{ {
throw Buffer::Exception(Result::Err_InvalidSize); RETURN_OR_EXCEPT(Result::Err_InvalidSize);
} }
size_t numWritten = 0;
while(len) while(len)
{ {
size_t num_remain = m_capacity - m_wi; size_t num_remain = m_capacity - m_wi;
size_t actual_len = std::min(num_remain, len); size_t actual_len = std::min(num_remain, len);
memcpy(data_w(), pData, actual_len*sizeof(T)); memcpy(data_w(), pData, actual_len*sizeof(T));
produce(actual_len);
len -= actual_len; len -= actual_len;
pData += actual_len; pData += actual_len;
numWritten += actual_len; numWritten += actual_len;
} }
return numWritten; return produce(numWritten);
} }
template<typename T> template<typename T>
size_t Buffer<T>::read(T* pData, size_t len) typename Buffer<T>::Result Buffer<T>::read(T* pData, size_t len)
{ {
len = std::min(m_len, len); if (len > m_len)
{
RETURN_OR_EXCEPT(Result::Err_InvalidSize);
}
size_t numRead = 0; size_t numRead = 0;
while(len) while(len)
{ {
@@ -134,15 +134,13 @@ size_t Buffer<T>::read(T* pData, size_t len)
pData += actual_len; pData += actual_len;
numRead += actual_len; numRead += actual_len;
} }
consume(numRead); return consume(numRead);
return numRead;
} }
template<typename T> template<typename T>
T Buffer<T>::readAt(size_t offset) T Buffer<T>::readAt(size_t offset)
{ {
if (m_len < offset) if (m_len < (1+offset))
{ {
throw Buffer::Exception(Result::Err_InvalidSize); throw Buffer::Exception(Result::Err_InvalidSize);
} }
@@ -168,7 +166,7 @@ typename Buffer<T>::Result Buffer<T>::consume(size_t len)
template<typename T> template<typename T>
typename Buffer<T>::Result Buffer<T>::produce(size_t len) typename Buffer<T>::Result Buffer<T>::produce(size_t len)
{ {
if (len > (m_capacity - m_len)) if (len > free())
{ {
RETURN_OR_EXCEPT(Result::Err_InvalidSize); RETURN_OR_EXCEPT(Result::Err_InvalidSize);
} }