summaryrefslogtreecommitdiffstats
path: root/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
diff options
context:
space:
mode:
authorGreg Clayton <gclayton@apple.com>2015-08-13 23:16:15 +0000
committerGreg Clayton <gclayton@apple.com>2015-08-13 23:16:15 +0000
commit1202881f9add3577133575ed7deaa63336f42b97 (patch)
treeef1cc818f9c4db6eda26a4c8f839432abb64136e /lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
parentaa0d51f062ff3a8414ce2ca9c46bd473d06eadf2 (diff)
downloadbcm5719-llvm-1202881f9add3577133575ed7deaa63336f42b97.tar.gz
bcm5719-llvm-1202881f9add3577133575ed7deaa63336f42b97.zip
Don't crash when we have a .a file that contains an object with a 16 character name. Any calls to std::string::erase must be bounds checked.
<rdar://problem/22260988> llvm-svn: 244984
Diffstat (limited to 'lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp')
-rw-r--r--lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
index 8209d23c0ae..d9d399c5eff 100644
--- a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
+++ b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
@@ -105,7 +105,9 @@ ObjectContainerBSDArchive::Object::Extract (const DataExtractor& data, lldb::off
{
// Strip off any spaces (if the object file name contains spaces it
// will use the extended format above).
- str.erase (str.find(' '));
+ const size_t space_pos = str.find(' ');
+ if (space_pos != std::string::npos)
+ str.erase (space_pos);
ar_name.SetCString(str.c_str());
}
OpenPOWER on IntegriCloud