From 14b71e988bdc7964f1a504415c4068b2370a87a7 Mon Sep 17 00:00:00 2001
From: Bartosz Taudul <wolf.pld@gmail.com>
Date: Tue, 19 Jun 2018 21:54:12 +0200
Subject: [PATCH] Properly skip memory event data.

---
 server/TracyWorker.cpp | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
index f6fe44d4..717441ab 100644
--- a/server/TracyWorker.cpp
+++ b/server/TracyWorker.cpp
@@ -594,13 +594,27 @@ Worker::Worker( FileRead& f, EventType::Type eventMask )
     }
     else
     {
-        f.Skip( sz * (
-            sizeof( MemEvent::ptr ) +
-            sizeof( MemEvent::size ) +
-            sizeof( MemEvent::timeAlloc ) +
-            sizeof( MemEvent::timeFree ) +
-            sizeof( uint64_t ) +
-            sizeof( uint64_t ) ) );
+        if( fileVer <= FileVersion( 0, 3, 1 ) )
+        {
+            f.Skip( sz * (
+                sizeof( MemEvent::ptr ) +
+                sizeof( MemEvent::size ) +
+                sizeof( MemEvent::timeAlloc ) +
+                sizeof( MemEvent::timeFree ) +
+                sizeof( uint64_t ) +
+                sizeof( uint64_t ) ) );
+        }
+        else
+        {
+            f.Skip( sz * (
+                sizeof( MemEvent::ptr ) +
+                sizeof( MemEvent::size ) +
+                sizeof( MemEvent::timeAlloc ) +
+                sizeof( MemEvent::timeFree ) +
+                sizeof( MemEvent::callstack ) +
+                sizeof( uint64_t ) +
+                sizeof( uint64_t ) ) );
+        }
         f.Skip( sizeof( MemData::high ) + sizeof( MemData::low ) + sizeof( MemData::usage ) );
     }
 }