Fix frame id assertion in case no frame id available.

diff --git a/src/protocols/cliprotocol.cpp b/src/protocols/cliprotocol.cpp
index 4c37805907124c378a1abcde33ba033e3e579f78..2c03b05dd9db7ec867fa137826c21c540ef282d8 100644 (file)
--- a/src/protocols/cliprotocol.cpp
+++ b/src/protocols/cliprotocol.cpp
@@ -960,11 +960,9 @@ void CLIProtocol::EmitStoppedEvent(const StoppedEvent &event)
 
     std::string frameLocation;
     PrintFrameLocation(event.frame, frameLocation);
-    m_sourceFile = event.frame.source.name; 
     m_sourcePath = event.frame.source.path;
     m_sourceLine = event.frame.line - m_listSize / 2;
     m_stoppedAt = event.frame.line;
-    m_frameId = event.frame.id;
 
     switch(event.reason)
     {

diff --git a/src/protocols/cliprotocol.h b/src/protocols/cliprotocol.h
index 414cb0d031f4a94a4f55c49643ecef6b44b35367..70a5d098383994f47f6d2dbaf26ebf71b423a124 100644 (file)
--- a/src/protocols/cliprotocol.h
+++ b/src/protocols/cliprotocol.h
@@ -60,9 +60,7 @@ class CLIProtocol : public IProtocol
     std::unordered_map<uint32_t, FuncBreakpoint> m_funcBreakpoints;
     std::unordered_map<uint32_t, ExceptionBreakpoint> m_exceptionBreakpoints;
 
-    FrameId m_frameId;
     std::string m_sourcePath;
-    std::string m_sourceFile;
     int m_sourceLine;
     int m_listSize;
     int m_stoppedAt;

diff --git a/src/protocols/miprotocol.cpp b/src/protocols/miprotocol.cpp
index b75a79d15f3b3b0d6245b018b947a36e61d3be0d..d41458389d026841e878d9fccaf4d1c64083d611 100644 (file)
--- a/src/protocols/miprotocol.cpp
+++ b/src/protocols/miprotocol.cpp
@@ -132,7 +132,7 @@ static HRESULT PrintFrameLocation(const StackFrame &stackFrame, std::string &out
     }
 
     ss << "func=\"" << stackFrame.name << "\"";
-    if (stackFrame.id != 0)
+    if (stackFrame.id)
         ss << ",addr=\"" << ProtocolUtils::AddrToString(stackFrame.addr) << "\"";
 
     output = ss.str();