mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-30 04:43:53 +00:00
Code Issues Releases Wiki Activity

Fix callstackPayload overflow when data to read size was POT.

Browse Source
This commit is contained in:
Bartosz Taudul 2022-09-02 18:52:32 +02:00
parent 2f44f65e02
commit 8b75a3fab0
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/TracyWorker.cpp
View File

@ -535,8 +535,6 @@ Worker::Worker( FileRead& f, EventType::Type eventMask, bool bgTasks )
{ {
auto loadStart = std::chrono::high_resolution_clock::now(); auto loadStart = std::chrono::high_resolution_clock::now();
m_data.callstackPayload.push_back( nullptr );
int fileVer = 0; int fileVer = 0;
uint8_t hdr[8]; uint8_t hdr[8];
@ -1344,7 +1342,8 @@ Worker::Worker( FileRead& f, EventType::Type eventMask, bool bgTasks )
s_loadProgress.subTotal.store( 0, std::memory_order_relaxed ); s_loadProgress.subTotal.store( 0, std::memory_order_relaxed );
s_loadProgress.progress.store( LoadProgress::CallStacks, std::memory_order_relaxed ); s_loadProgress.progress.store( LoadProgress::CallStacks, std::memory_order_relaxed );
f.Read( sz ); f.Read( sz );
m_data.callstackPayload.reserve( sz ); m_data.callstackPayload.reserve_exact( sz+1, m_slab );
m_data.callstackPayload[0] = nullptr;
for( uint64_t i=0; i<sz; i++ ) for( uint64_t i=0; i<sz; i++ )
{ {
uint16_t csz; uint16_t csz;
@ -1359,7 +1358,7 @@ Worker::Worker( FileRead& f, EventType::Type eventMask, bool bgTasks )
auto arr = (VarArray<CallstackFrameId>*)( mem + csz * sizeof( CallstackFrameId ) ); auto arr = (VarArray<CallstackFrameId>*)( mem + csz * sizeof( CallstackFrameId ) );
new(arr) VarArray<CallstackFrameId>( csz, data ); new(arr) VarArray<CallstackFrameId>( csz, data );
m_data.callstackPayload.push_back_no_space_check( arr ); m_data.callstackPayload[i+1] = arr;
} }
f.Read( sz ); f.Read( sz );