[Lldb-commits] [lldb] r200784 - Avoid accessing an element of an empty vector in a log message

[Ed Maste]

Author: emaste
Date: Tue Feb  4 12:51:11 2014
New Revision: 200784

URL: http://llvm.org/viewvc/llvm-project?rev=200784&view=rev
Log:
Avoid accessing an element of an empty vector in a log message

Modified:
    lldb/trunk/source/Core/Broadcaster.cpp

Modified: lldb/trunk/source/Core/Broadcaster.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Broadcaster.cpp?rev=200784&r1=200783&r2=200784&view=diff
==============================================================================
--- lldb/trunk/source/Core/Broadcaster.cpp (original)
+++ lldb/trunk/source/Core/Broadcaster.cpp Tue Feb  4 12:51:11 2014
@@ -313,18 +313,20 @@ Broadcaster::RestoreBroadcaster ()
 {
     Mutex::Locker event_types_locker(m_listeners_mutex);
 
-    Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EVENTS));
-    if (log)
-    {
-        Listener *listener = m_hijacking_listeners.back();
-        log->Printf ("%p Broadcaster(\"%s\")::RestoreBroadcaster (about to pop listener(\"%s\")=%p)",
-                     this,
-                     m_broadcaster_name.AsCString(""),
-                     listener->m_name.c_str(),
-                     listener);
-    }
     if (!m_hijacking_listeners.empty())
+    {
+        Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EVENTS));
+        if (log)
+        {
+            Listener *listener = m_hijacking_listeners.back();
+            log->Printf ("%p Broadcaster(\"%s\")::RestoreBroadcaster (about to pop listener(\"%s\")=%p)",
+                         this,
+                         m_broadcaster_name.AsCString(""),
+                         listener->m_name.c_str(),
+                         listener);
+        }
         m_hijacking_listeners.pop_back();
+    }
     if (!m_hijacking_masks.empty())
         m_hijacking_masks.pop_back();
 }