commit 5b202ffc2561c28181ceeab73528f8506f62ada2
author Pavel Labath <pavel@labath.sk> Tue Jul 12 20:05:20 2022 +0200
committer Copybara-Service <copybara-worker@google.com> Tue Jul 12 11:16:51 2022 -0700
tree 5ac6cec5c875bb7636612e127274a2d07b7d8c7c
parent 66c0758940a5e55b384727b069bfb30be7a4006a

[lldb] Fix TestDataFormatterLibcxxString broken by D129490

We need to check for the error inside the value object to avoid reading
garbage through invalid (target) pointers.

GitOrigin-RevId: a72306e202eedaed7c1a25caf4565bf5577110ce

source/Plugins/Language/CPlusPlus/LibCxx.cpp

diff --git a/source/Plugins/Language/CPlusPlus/LibCxx.cpp b/source/Plugins/Language/CPlusPlus/LibCxx.cpp
index aaf3464..3b04b3a 100644
--- a/source/Plugins/Language/CPlusPlus/LibCxx.cpp
+++ b/source/Plugins/Language/CPlusPlus/LibCxx.cpp
@@ -725,7 +725,7 @@
 ExtractLibcxxStringInfo(ValueObject &valobj) {
   ValueObjectSP valobj_r_sp =
       valobj.GetChildMemberWithName(ConstString("__r_"), /*can_create=*/true);
-  if (!valobj_r_sp)
+  if (!valobj_r_sp || !valobj_r_sp->GetError().Success())
     return {};
 
   // __r_ is a compressed_pair of the actual data and the allocator. The data we