aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2006-05-12 18:13:11 +0000
committerChris Lattner <sabre@nondot.org>2006-05-12 18:13:11 +0000
commit2b80e8d6352ef585570f04c05fc8507f555b43b6 (patch)
tree5b9963888bc81f9553cfad55860b3426be403c00
parentbbea1245a1b7e2bce79fe34d9331dab2e42fa3a4 (diff)
Fix iterator invalidation bug, identified by Coverity.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28257 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/System/DynamicLibrary.cpp1
-rw-r--r--lib/System/Unix/Process.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/System/DynamicLibrary.cpp b/lib/System/DynamicLibrary.cpp
index 0c179fc2f7..056fed0eb3 100644
--- a/lib/System/DynamicLibrary.cpp
+++ b/lib/System/DynamicLibrary.cpp
@@ -93,6 +93,7 @@ DynamicLibrary::~DynamicLibrary() {
if (*I == a_handle) {
// Note: don't use the swap/pop_back trick here. Order is important.
OpenedHandles.erase(I);
+ return;
}
}
}
diff --git a/lib/System/Unix/Process.inc b/lib/System/Unix/Process.inc
index 32733d6136..f4bc873a82 100644
--- a/lib/System/Unix/Process.inc
+++ b/lib/System/Unix/Process.inc
@@ -95,7 +95,7 @@ Process::GetTimeUsage(TimeValue& elapsed, TimeValue& user_time,
TimeValue& sys_time)
{
elapsed = TimeValue::now();
-#if defined(HAVE_GETRUSAGE)
+#if 0 // defined(HAVE_GETRUSAGE)
struct rusage usage;
::getrusage(RUSAGE_SELF, &usage);
user_time = TimeValue(