<div dir="ltr">Thanks for fixing this!</div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Oct 24, 2014 at 8:52 AM, Benjamin Kramer <span dir="ltr"><<a href="mailto:benny.kra@googlemail.com" target="_blank">benny.kra@googlemail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: d0k<br>
Date: Fri Oct 24 10:52:05 2014<br>
New Revision: 220567<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=220567&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=220567&view=rev</a><br>
Log:<br>
[Object] Fix MachO's getUuid to return a pointer into the object instead of a dangling ArrayRef.<br>
<br>
This works because uuid's are always little endian so it's not swapped.<br>
Fixes use-after-return reported by asan.<br>
<br>
Modified:<br>
    llvm/trunk/lib/Object/MachOObjectFile.cpp<br>
<br>
Modified: llvm/trunk/lib/Object/MachOObjectFile.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/MachOObjectFile.cpp?rev=220567&r1=220566&r2=220567&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/MachOObjectFile.cpp?rev=220567&r1=220566&r2=220567&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Object/MachOObjectFile.cpp (original)<br>
+++ llvm/trunk/lib/Object/MachOObjectFile.cpp Fri Oct 24 10:52:05 2014<br>
@@ -2460,8 +2460,9 @@ ArrayRef<uint8_t> MachOObjectFile::getDy<br>
 ArrayRef<uint8_t> MachOObjectFile::getUuid() const {<br>
   if (!UuidLoadCmd)<br>
     return ArrayRef<uint8_t>();<br>
-  MachO::uuid_command Uuid = getStruct<MachO::uuid_command>(this, UuidLoadCmd);<br>
-  return ArrayRef<uint8_t>(Uuid.uuid, 16);<br>
+  // Returning a pointer is fine as uuid doesn't need endian swapping.<br>
+  const char *Ptr = UuidLoadCmd + offsetof(MachO::uuid_command, uuid);<br>
+  return ArrayRef<uint8_t>(reinterpret_cast<const uint8_t *>(Ptr), 16);<br>
 }<br>
<br>
 StringRef MachOObjectFile::getStringTableData() const {<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div>
</div>