Fix iterator invalidation bug, identified by Coverity.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28257 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/System/DynamicLibrary.cpp b/lib/System/DynamicLibrary.cpp
index 0c179fc2f7eb4045e21f9526afd089191102d5fe..056fed0eb38e5493a378704bb0df759f87861aff 100644 (file)
--- 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 32733d61366863bf47d203584d2b44eb265d3598..f4bc873a8299c59ce0f37a17034ad9e091b921c5 100644 (file)
--- 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(