From 9ba45e98f4e3aa40c0d38643e1387fddb4004cc0 Mon Sep 17 00:00:00 2001
From: Kevin Enderby <enderby@apple.com>
Date: Thu, 8 Oct 2015 16:56:35 +0000
Subject: [PATCH] =?utf8?q?Fix=20a=20bug=20in=20llvm-objdump=E2=80=99s=20pr?=
 =?utf8?q?inting=20of=20Objective-C=20meta=20data=20from=20malformed=20Mac?=
 =?utf8?q?h-O=20files=20that=20caused=20a=20crash=20because=20of=20loops?=
 =?utf8?q?=20in=20the=20class=20meta=20data.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@249700 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../Inputs/malformed-machos/mem-crup-0010.macho  | Bin 0 -> 9248 bytes
 test/tools/llvm-objdump/malformed-machos.test    |   6 ++++++
 tools/llvm-objdump/MachODump.cpp                 |  12 +++++++++---
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 test/tools/llvm-objdump/Inputs/malformed-machos/mem-crup-0010.macho

diff --git a/test/tools/llvm-objdump/Inputs/malformed-machos/mem-crup-0010.macho b/test/tools/llvm-objdump/Inputs/malformed-machos/mem-crup-0010.macho
new file mode 100644
index 0000000000000000000000000000000000000000..4c7e78d93b62d51b57e665aa3b8ba6b224481077
GIT binary patch
literal 9248
zcmeHNO>7%Q6dpG%4I$7?;SivJgHlwW@usMa0#c<oKa~R^N#g_|P&M_>CfRnq>w4E}
zjHqx_iio00KJX)PLWo;0J#ayQs00UY9N>@>>H$!Yij)HqRV4`D+nKS~>$v2=1!<o$
zJM+z(`R2{@o7L=0zQ6PP-}@O`?O=@EgQOwdM8y@q#Mr~Y-|b<H^ZAKa=K;b(9fBe;
zDA+!vPO0PEGgiDt!!Y0T2ZU}wHc`0VV=t@L%P4T}dgZKJuL|=mN<Nws3E`M1`p-_u
zr}To4FB?|TD4|7|&yswPNDjhqOG8@hbF$}hykL0CcBWvo@Vz7X$VVg!3l!o;CFee0
z&dRth5r*wsmwfk00)_vDkL>d*#a8=1kbLU*Q@A}}*}iDnd2ZT^j&E;synHPAQj&mh
zlm8U4%sDrf`C^G&=Sz6Lo06|rwkJ$6+)f&CJf56S23o23ZIe?R6R+|E=eEV&N+Ii5
zyy%tiyX?%T=x7-Q?V@-K#v$ic=5BnNBvRuO4)Q7c)Qp00VwtWNwy!tDM>xm_9@#=L
zN<OoYSu*IS4fDlAe1z}*yNWn=Y}bDqg!zt0zUy*AghTeJsrtFJ&o!))v540}m~TV!
zDgO};@?rhS7ESYY%XkeCW0>z|h>viP4=g+J<uhJJ+S?p2o3iz+7@qCGCp99YIHonk
z`PAg}OB3Uh>YW@H`ugY+$M=eQij!d6-48sBMC(V?(=*2OvRl$ECzr8w%gpMYX;%jF
z6%-TxlRe2;br3CCTuf9$UIkQAi~A~e9XZ)au|Q)C_Az!4`B@O$z)<v_Qgfy<C2C7{
zsdplZEi#M#a!O6QM}cUZYdx?1@#WXY{(Sd~^hfhgl!yCK=exM8i!r2U6h=<cjdT`?
z`qKDJdkgeOV|u#cdPYH?GP9*jsiL2vSJ6eMbl%lZIb|Ear|H-U{{=<0`YT4sMUAVE
z1@xdJ{$Zp#Kl>R-`57LDYiUI!lG4G@lC<{w3U)R36DB4`gFT-@Uz+djxOithEir@t
zNuEXW{Q*4a*F=xV1Ca+J4@4e_JP>(c*B)3%t^Ja^d`nBMUD`^m?|Tn>n$+6F?bP~-
zRVrS+w6#fl{nX`ewKLyrAN~~OsjH8@k1UzqK70jvZ5a>t+ppW(+oo-LjP_bw?6O9V
z4UG)GK>G%8u|w1j63l6@Lf^>8kyBcd-$PWU{b)COYJP73&^+X4D7-PpVk=rq>)zj4
zBl3{EDS6bsRH;`{I3km(qdfeb8Px4mrhO0%tG;*DccuE?uR_-;6SBIfaf<%trC!~(
zp!n51w4Sz2eMN1Ty!1U1N#udZ1Ca+J4@4e_JP>&x@<8N)$ODlFA`e6!_`i9er%#(3
zFAk>1=El=w#rWxiBYbA`#W6lMl}x93Kc7y|WX~BnkDb1-6{|_*%M<g-mIl?{8ua3t
z+9(vg3eRP7%Lc1%;DE!I*k`o|M{vNA_wVj`7T3kNYp-tnrSvt%E@-g8zalKSOKHQ-
zr|Bl{IR=%Gn6Qs^u|3L!z`@CI(6m7P$qu&Jhl7zCu8(~A{Be=r`Kg<(n~oykex)wz
zWW>J`LT&wuk1F!@X5tPdh)+Vd*b!r&%>1}O&4?(0hdST50o)(Jr0+*k|Mx(68V`kk
z0FEOmxrIVp0p!#^PY)^gqWl1o8t)Lw2XJPg&OuH{tj<H`fbpm1$;=RbJA^+B;cEid
z{X@qi@~CBm%5kPIxVRhBXG@M}WL$mRaL;>AQQRyR5Ft+Bl2H#Ff+Y&O=sH?9t-L;I
zdq$~X<jss{xB=!w)>qFN7DhG#<4A=FZFj(SN(Eeat_%<Hq2qotaSoSo*ud+JD2mfD
n-5J)rKpJYPXcK||8Bz1__4O&LgM&9zt&4J}CDyVsDWv`ZO<o%c

literal 0
HcmV?d00001

diff --git a/test/tools/llvm-objdump/malformed-machos.test b/test/tools/llvm-objdump/malformed-machos.test
index 4e1765f7f42..e836239a250 100644
--- a/test/tools/llvm-objdump/malformed-machos.test
+++ b/test/tools/llvm-objdump/malformed-machos.test
@@ -12,3 +12,9 @@
 # RUN:   | FileCheck -check-prefix=m0006 %s 
 
 # m0006: ivarLayout 0x8
+
+# RUN: llvm-objdump -macho -objc-meta-data \
+# RUN:   %p/Inputs/malformed-machos/mem-crup-0006.macho \
+# RUN:   | FileCheck -check-prefix=m0010 %s 
+
+# m0010: 00000000000010e0 0x10e8 _OBJC_CLASS_
diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp
index 0e9bf3695d8..b6b910f55dc 100644
--- a/tools/llvm-objdump/MachODump.cpp
+++ b/tools/llvm-objdump/MachODump.cpp
@@ -1667,6 +1667,7 @@ struct DisassembleInfo {
   uint64_t adrp_addr;
   uint32_t adrp_inst;
   BindTable *bindtable;
+  uint32_t depth;
 };
 
 // SymbolizerGetOpInfo() is the operand information call back function.
@@ -4463,9 +4464,13 @@ static void print_class64_t(uint64_t p, struct DisassembleInfo *info) {
   bool is_meta_class;
   print_class_ro64_t((c.data + n_value) & ~0x7, info, is_meta_class);
 
-  if (!is_meta_class) {
-    outs() << "Meta Class\n";
-    print_class64_t(c.isa + isa_n_value, info);
+  if (!is_meta_class &&
+      c.isa + isa_n_value != p &&
+      c.isa + isa_n_value != 0 &&
+      info->depth < 100) {
+      info->depth++;
+      outs() << "Meta Class\n";
+      print_class64_t(c.isa + isa_n_value, info);
   }
 }
 
@@ -5113,6 +5118,7 @@ static void printObjc2_64bit_MetaData(MachOObjectFile *O, bool verbose) {
   info.adrp_addr = 0;
   info.adrp_inst = 0;
 
+  info.depth = 0;
   const SectionRef CL = get_section(O, "__OBJC2", "__class_list");
   if (CL != SectionRef()) {
     info.S = CL;
-- 
2.34.1