[llvm-branch-commits] [lldb] r182521 - Merging r182437:

[Bill Wendling]

Author: void
Date: Wed May 22 16:24:36 2013
New Revision: 182521

URL: http://llvm.org/viewvc/llvm-project?rev=182521&view=rev
Log:
Merging r182437:
------------------------------------------------------------------------
r182437 | gclayton | 2013-05-21 16:36:34 -0700 (Tue, 21 May 2013) | 5 lines

<rdar://problem/13455021>

lldb crashes with universal file containing skinny BSD archives when doing DWARF with .o file debugging.


------------------------------------------------------------------------

Modified:
    lldb/branches/release_33/   (props changed)
    lldb/branches/release_33/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp

Propchange: lldb/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 22 16:24:36 2013
@@ -1,2 +1,2 @@
 /lldb/branches/apple/python-GIL:156467-162159
-/lldb/trunk:182066,182153,182166,182301,182326
+/lldb/trunk:182066,182153,182166,182301,182326,182437

Modified: lldb/branches/release_33/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_33/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp?rev=182521&r1=182520&r2=182521&view=diff
==============================================================================
--- lldb/branches/release_33/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp (original)
+++ lldb/branches/release_33/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp Wed May 22 16:24:36 2013
@@ -457,7 +457,7 @@ ObjectContainerBSDArchive::GetObjectFile
                                                        module_sp->GetObjectModificationTime());
             if (object)
             {
-                lldb::offset_t data_offset = m_offset + object->ar_file_offset;
+                lldb::offset_t data_offset = object->ar_file_offset;
                 return ObjectFile::FindPlugin (module_sp,
                                                file, 
                                                m_offset + object->ar_file_offset,