Bug fixes:
- Fixed bugs on CRollingBuffer and CShiftBuffer - Remove "virtual" from methods declarations - Correct validation checks on methods - Use memmove to shift data in ShiftBuffer - Initialise buffer in RollingBuffer - FindStr() -> Return start position of match - Fix incorrect params passed to Peek()/PeekCopy() in Pop()/PopCopy() - Fix endless lopp in RollingBuffer::Push()
This commit is contained in:
Charl Wentzel
@@ -26,8 +26,10 @@ CRollingBuffer::CRollingBuffer( int BufferSize ) : BufSize( BufferSize )
|
||||
{
|
||||
// Create Buffer
|
||||
Buffer = (char *)malloc( BufSize+1 );
|
||||
memset( Buffer, 0, BufSize+1 );
|
||||
|
||||
// Create temp output buffer big enough to handle all data
|
||||
OutBuffer = (char *)malloc( BufSize+1 );
|
||||
OutBuffer[0] = 0;
|
||||
}
|
||||
else {
|
||||
// No buffers created
|
||||
@@ -77,7 +79,7 @@ char CRollingBuffer::PeekChar( int Pos )
|
||||
char CharValue = 0;
|
||||
|
||||
// Validate buffer and Pos
|
||||
if (!BufLen || (Pos < 0) || (Pos > BufLen)) {
|
||||
if (!BufSize || (Pos < 0) || (Pos > BufLen)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -103,7 +105,7 @@ int CRollingBuffer::PeekDirect( char ** Data, int PeekPos )
|
||||
int StartPos = 0;
|
||||
|
||||
// Validate
|
||||
if (!BufLen || !Data || (PeekPos >= BufLen)) {
|
||||
if (!BufSize || !Data || (PeekPos > BufLen)) {
|
||||
*Data = NULL;
|
||||
return 0;
|
||||
}
|
||||
@@ -133,7 +135,7 @@ int CRollingBuffer::Peek( char ** Data, int PeekPos, int MaxLen )
|
||||
int StartPos = 0;
|
||||
|
||||
// Validate
|
||||
if (!BufLen || !*Data || !MaxLen || (PeekPos < 0) || (PeekPos > BufLen)) {
|
||||
if (!BufSize || !Data || !MaxLen || (PeekPos < 0) || (PeekPos > BufLen)) {
|
||||
*Data = NULL;
|
||||
return 0;
|
||||
}
|
||||
@@ -178,7 +180,7 @@ int CRollingBuffer::PeekCopy( char ** Data, int PeekPos, int MaxLen )
|
||||
int StartPos = 0;
|
||||
|
||||
// Check if any data
|
||||
if (!BufLen || !*Data || !MaxLen || (PeekPos < 0) || (PeekPos > BufLen)) {
|
||||
if (!BufSize || !Data || !MaxLen || (PeekPos < 0) || (PeekPos > BufLen)) {
|
||||
if (*Data) (*Data)[0] = 0;
|
||||
return 0;
|
||||
}
|
||||
@@ -224,7 +226,7 @@ bool CRollingBuffer::FindStr( const char * SearchStr, int SearchLen, int &FoundP
|
||||
char * MatchLimit = NULL;
|
||||
|
||||
// Check if buffer exists
|
||||
if (!BufLen || !SearchStr || !SearchLen) {
|
||||
if (!BufSize || !SearchStr || !SearchLen) {
|
||||
FoundPos = -1;
|
||||
return false;
|
||||
}
|
||||
@@ -251,7 +253,7 @@ bool CRollingBuffer::FindStr( const char * SearchStr, int SearchLen, int &FoundP
|
||||
if (*CheckPos == *MatchPos) {
|
||||
if (MatchPos == MatchLimit) {
|
||||
// Full match found
|
||||
FoundPos -= SearchLen;
|
||||
FoundPos -= SearchLen-1;
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
@@ -326,7 +328,7 @@ int CRollingBuffer::Push( bool Overwrite, const char * Data, int Len )
|
||||
DataRemain = (!Overwrite && (Len > BufSize-BufLen))? BufSize-BufLen : Len;
|
||||
|
||||
// Read Data into buffer
|
||||
while (TotalPushed < Len)
|
||||
while (DataRemain)
|
||||
{
|
||||
// Read from file descriptor
|
||||
BufRemain = BufSize - BufEnd;
|
||||
@@ -362,7 +364,7 @@ int CRollingBuffer::Pop( char ** Data, int MaxLen )
|
||||
int BytesWritten = 0;
|
||||
|
||||
// Read & clear data
|
||||
BytesWritten = Peek( Data, MaxLen );
|
||||
BytesWritten = Peek( Data, 0, MaxLen );
|
||||
Clear( BytesWritten );
|
||||
|
||||
// Return temp buffer
|
||||
@@ -377,7 +379,7 @@ int CRollingBuffer::PopCopy( char ** Data, int MaxLen )
|
||||
int BytesWritten = 0;
|
||||
|
||||
// Copy & clear data
|
||||
BytesWritten = PeekCopy( Data, MaxLen );
|
||||
BytesWritten = PeekCopy( Data, 0, MaxLen );
|
||||
Clear( BytesWritten );
|
||||
|
||||
// Return temp buffer
|
||||
@@ -486,6 +488,7 @@ CShiftBuffer::CShiftBuffer( int BufferSize ) : BufSize( BufferSize )
|
||||
Buffer = (char *)malloc( BufSize+1 );
|
||||
Buffer[0] = 0;
|
||||
|
||||
// Create temp output buffer big enough to handle all data
|
||||
OutBuffer = (char *)malloc( BufSize+1 );
|
||||
}
|
||||
else {
|
||||
@@ -529,7 +532,7 @@ int CShiftBuffer::Reset()
|
||||
char CShiftBuffer::PeekChar( int Pos )
|
||||
{
|
||||
// Validate buffer and Pos
|
||||
if (!BufLen || (Pos < 0) || (Pos > BufLen)) {
|
||||
if (!BufSize || (Pos < 0) || (Pos > BufLen)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -543,7 +546,7 @@ char CShiftBuffer::PeekChar( int Pos )
|
||||
int CShiftBuffer::PeekDirect( char ** Data, int PeekPos )
|
||||
{
|
||||
// Validate
|
||||
if (!BufLen || !Data || (PeekPos >= BufLen)) {
|
||||
if (!BufSize || !Data || (PeekPos > BufLen)) {
|
||||
*Data = NULL;
|
||||
return 0;
|
||||
}
|
||||
@@ -560,7 +563,7 @@ int CShiftBuffer::Peek( char ** Data, int PeekPos, int MaxLen )
|
||||
int BytesReturned = 0;
|
||||
|
||||
// Validate
|
||||
if (!BufLen || !Data || !MaxLen || (PeekPos < 0) || (PeekPos > BufLen)) {
|
||||
if (!BufSize || !Data || !MaxLen || (PeekPos < 0) || (PeekPos > BufLen)) {
|
||||
*Data = NULL;
|
||||
return 0;
|
||||
}
|
||||
@@ -572,7 +575,7 @@ int CShiftBuffer::Peek( char ** Data, int PeekPos, int MaxLen )
|
||||
BytesReturned = (MaxLen > BufLen - PeekPos)? (BufLen - PeekPos) : MaxLen;
|
||||
|
||||
// Copy Data from Buffer
|
||||
memcpy( OutBuffer, Buffer, BytesReturned );
|
||||
memcpy( OutBuffer, &Buffer[PeekPos], BytesReturned );
|
||||
OutBuffer[BytesReturned] = 0;
|
||||
|
||||
// Return Temp buffer
|
||||
@@ -589,7 +592,7 @@ int CShiftBuffer::PeekCopy( char ** Data, int PeekPos, int MaxLen )
|
||||
int StartPos = 0;
|
||||
|
||||
// Check if any data
|
||||
if (!BufLen || !Data || !MaxLen || (PeekPos < 0) || (PeekPos > BufLen)) {
|
||||
if (!BufSize || !Data || !MaxLen || (PeekPos < 0) || (PeekPos > BufLen)) {
|
||||
if (*Data) (*Data)[0] = 0;
|
||||
return 0;
|
||||
}
|
||||
@@ -621,7 +624,7 @@ bool CShiftBuffer::FindStr( const char * SearchStr, int SearchLen, int &FoundPos
|
||||
char * MatchLimit = NULL;
|
||||
|
||||
// Check if buffer exists
|
||||
if (!BufLen || !SearchStr || !SearchLen) {
|
||||
if (!BufSize || !SearchStr || !SearchLen) {
|
||||
FoundPos = -1;
|
||||
return false;
|
||||
}
|
||||
@@ -648,7 +651,7 @@ bool CShiftBuffer::FindStr( const char * SearchStr, int SearchLen, int &FoundPos
|
||||
if (*CheckPos == *MatchPos) {
|
||||
if (MatchPos == MatchLimit) {
|
||||
// Full match found
|
||||
FoundPos -= SearchLen;
|
||||
FoundPos -= SearchLen-1;
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
@@ -692,7 +695,7 @@ int CShiftBuffer::Clear( int ClearLen )
|
||||
else {
|
||||
// Shift remaining data
|
||||
BytesCleared = ClearLen;
|
||||
memcpy( Buffer, &Buffer[ClearLen], BufLen-ClearLen ); // Shift remaining old data left
|
||||
memmove( Buffer, &Buffer[ClearLen], BufLen-ClearLen ); // Shift remaining old data left
|
||||
BufLen -= ClearLen;
|
||||
Buffer[BufLen] = 0;
|
||||
}
|
||||
@@ -756,7 +759,7 @@ int CShiftBuffer::Pop( char ** Data, int MaxLen )
|
||||
int BytesWritten = 0;
|
||||
|
||||
// Read and clear bytes
|
||||
BytesWritten = Peek( Data, MaxLen );
|
||||
BytesWritten = Peek( Data, 0, MaxLen );
|
||||
Clear( BytesWritten );
|
||||
|
||||
return BytesWritten;
|
||||
@@ -770,7 +773,7 @@ int CShiftBuffer::PopCopy( char ** Data, int MaxLen )
|
||||
int BytesWritten = 0;
|
||||
|
||||
// Copy and clear bytes
|
||||
BytesWritten = PeekCopy( Data, MaxLen );
|
||||
BytesWritten = PeekCopy( Data, 0, MaxLen );
|
||||
Clear( BytesWritten );
|
||||
|
||||
// Return temp buffer
|
||||
|
||||
Reference in New Issue
Block a user