[Lldb-commits] [PATCH] D101585: [lldb] Handle missing SBStructuredData copy assignment cases

[Dave Lee via Phabricator via lldb-commits]

kastiglione created this revision.
kastiglione added a reviewer: augusto2112.
kastiglione requested review of this revision.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.

Fix cases that can crash `SBStructuredData::operator=`.

This happened in a case where `rhs` had a null `SBStructuredDataImpl`.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D101585

Files:
  lldb/source/API/SBStructuredData.cpp


Index: lldb/source/API/SBStructuredData.cpp
===================================================================
--- lldb/source/API/SBStructuredData.cpp
+++ lldb/source/API/SBStructuredData.cpp
@@ -53,7 +53,13 @@
       lldb::SBStructuredData &,
       SBStructuredData, operator=,(const lldb::SBStructuredData &), rhs);
 
-  *m_impl_up = *rhs.m_impl_up;
+  if (m_impl_up && rhs.m_impl_up)
+    *m_impl_up = *rhs.m_impl_up;
+  else if (m_impl_up && !rhs.m_impl_up)
+    m_impl_up.release();
+  else if (!m_impl_up && rhs.m_impl_up)
+    m_impl_up = std::make_unique<StructuredDataImpl>(*rhs.m_impl_up);
+
   return LLDB_RECORD_RESULT(*this);
 }
 



Index: lldb/source/API/SBStructuredData.cpp
===================================================================
--- lldb/source/API/SBStructuredData.cpp
+++ lldb/source/API/SBStructuredData.cpp
@@ -53,7 +53,13 @@
       lldb::SBStructuredData &,
       SBStructuredData, operator=,(const lldb::SBStructuredData &), rhs);
 
-  *m_impl_up = *rhs.m_impl_up;
+  if (m_impl_up && rhs.m_impl_up)
+    *m_impl_up = *rhs.m_impl_up;
+  else if (m_impl_up && !rhs.m_impl_up)
+    m_impl_up.release();
+  else if (!m_impl_up && rhs.m_impl_up)
+    m_impl_up = std::make_unique<StructuredDataImpl>(*rhs.m_impl_up);
+
   return LLDB_RECORD_RESULT(*this);
 }
 

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits