Skip to content

fix(memorytracker): correct StringTable search and entry sizing #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rakdos8 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(memorytracker): correct StringTable search and entry sizing #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions CCPMemoryTracker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "include/CcpMutex.h"

#include <map>
#include <cstddef>

// #define CCP_UNIT_TEST 1

Expand Down Expand Up @@ -161,19 +162,20 @@ bool StringTable::Find( unsigned int id, unsigned int& ix )
const TableEntry& te = At( ix );
if( te.m_id < id )
{
hi = ix;
++ix;
lo = ix;
}
else if( te.m_id > id )
{
++ix;
lo = ix;
hi = ix;
}
else
{
return true;
}
}

ix = lo;
return false;
}

Expand All @@ -182,7 +184,7 @@ bool StringTable::AddString( unsigned int ix, unsigned int id, const char* szStr
CCP_ASSERT( m_pMemory );

/// First check to see if we have room for this string
size_t size = strlen( szString ) + sizeof( TableEntry ) + 1;
size_t size = strlen( szString ) + offsetof( StringEntry, m_string ) + 1;
size = (size + 3) & ~3;

char* pNewStringEntryBottom = (char*)m_pFirstStringEntry;
Expand Down Expand Up @@ -217,7 +219,7 @@ bool StringTable::AddString( unsigned int ix, unsigned int id, const char* szStr
pSE->m_size = size;
pSE->m_refCount = 1;
char* dst = &pSE->m_string[0];
strcpy_s( dst, size - sizeof( TableEntry ), szString );
strcpy_s( dst, size - offsetof( StringEntry, m_string ), szString );

/// Adjust the pointer for first string entry
m_pFirstStringEntry = pSE;
Expand Down