<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Mon, Apr 14, 2014 at 4:28 AM, Evgeniy Stepanov <span dir="ltr"><<a href="mailto:eugeni.stepanov@gmail.com" target="_blank">eugeni.stepanov@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi,<br>
<br>
something in this change caused a heap buffer overflow:<br>
<a href="http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-bootstrap/builds/3022/steps/check-llvm%20asan/logs/stdio" target="_blank">http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-bootstrap/builds/3022/steps/check-llvm%20asan/logs/stdio</a></blockquote>
<div><br></div><div>Somehow I managed to miss two lines in my commit :-(. Thanks for the heads up about this failure! Ill fix this shortly (after I re-run tests).</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div class="HOEnZb"><div class="h5">
<br>
On Mon, Apr 14, 2014 at 6:37 AM, Saleem Abdulrasool<br>
<<a href="mailto:compnerd@compnerd.org">compnerd@compnerd.org</a>> wrote:<br>
> Author: compnerd<br>
> Date: Sun Apr 13 21:37:28 2014<br>
> New Revision: 206146<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=206146&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=206146&view=rev</a><br>
> Log:<br>
> tools: simplify symbol handling in objdump<br>
><br>
> Rather than switching behaviour on whether a previous symbol has an auxiliary<br>
> symbol record for the next count of elements, simply iterate over the auxiliary<br>
> symbols right after processing the current symbol entry. This makes the<br>
> behaviour much simpler to follow and similar to llvm-readobj and yaml2obj.<br>
><br>
> Modified:<br>
> llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp<br>
><br>
> Modified: llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp?rev=206146&r1=206145&r2=206146&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp?rev=206146&r1=206145&r2=206146&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp (original)<br>
> +++ llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp Sun Apr 13 21:37:28 2014<br>
> @@ -664,14 +664,31 @@ static void PrintSectionContents(const O<br>
><br>
> static void PrintCOFFSymbolTable(const COFFObjectFile *coff) {<br>
> const coff_file_header *header;<br>
> - if (error(coff->getHeader(header))) return;<br>
> - int aux_count = 0;<br>
> - const coff_symbol *symbol = 0;<br>
> - for (int i = 0, e = header->NumberOfSymbols; i != e; ++i) {<br>
> - if (aux_count--) {<br>
> - if (symbol->isSectionDefinition()) {<br>
> + if (error(coff->getHeader(header)))<br>
> + return;<br>
> +<br>
> + for (unsigned SI = 0, SE = header->NumberOfSymbols; SI != SE; ++SI) {<br>
> + const coff_symbol *Symbol;<br>
> + StringRef Name;<br>
> + if (error(coff->getSymbol(SI, Symbol)))<br>
> + return;<br>
> +<br>
> + if (error(coff->getSymbolName(Symbol, Name)))<br>
> + return;<br>
> +<br>
> + outs() << "[" << format("%2d", SI) << "]"<br>
> + << "(sec " << format("%2d", int(Symbol->SectionNumber)) << ")"<br>
> + << "(fl 0x00)" // Flag bits, which COFF doesn't have.<br>
> + << "(ty " << format("%3x", unsigned(Symbol->Type)) << ")"<br>
> + << "(scl " << format("%3x", unsigned(Symbol->StorageClass)) << ") "<br>
> + << "(nx " << unsigned(Symbol->NumberOfAuxSymbols) << ") "<br>
> + << "0x" << format("%08x", unsigned(Symbol->Value)) << " "<br>
> + << Name << "\n";<br>
> +<br>
> + for (unsigned AI = 0, AE = Symbol->NumberOfAuxSymbols; AI < AE; ++AI, ++SI) {<br>
> + if (Symbol->isSectionDefinition()) {<br>
> const coff_aux_section_definition *asd;<br>
> - if (error(coff->getAuxSymbol<coff_aux_section_definition>(i, asd)))<br>
> + if (error(coff->getAuxSymbol<coff_aux_section_definition>(SI + 1, asd)))<br>
> return;<br>
><br>
> outs() << "AUX "<br>
> @@ -683,31 +700,17 @@ static void PrintCOFFSymbolTable(const C<br>
> << format("assoc %d comdat %d\n"<br>
> , unsigned(asd->Number)<br>
> , unsigned(asd->Selection));<br>
> - } else if (symbol->isFileRecord()) {<br>
> + } else if (Symbol->isFileRecord()) {<br>
> const coff_aux_file *AF;<br>
> - if (error(coff->getAuxSymbol<coff_aux_file>(i, AF)))<br>
> + if (error(coff->getAuxSymbol<coff_aux_file>(SI + 1, AF)))<br>
> return;<br>
><br>
> - StringRef Name(AF->FileName, (aux_count + 1) * COFF::SymbolSize);<br>
> + StringRef Name(AF->FileName,<br>
> + Symbol->NumberOfAuxSymbols * COFF::SymbolSize);<br>
> outs() << "AUX " << Name.rtrim(StringRef("\0", 1)) << '\n';<br>
> - i = i + aux_count;<br>
> - aux_count = 0;<br>
> } else {<br>
> outs() << "AUX Unknown\n";<br>
> }<br>
> - } else {<br>
> - StringRef name;<br>
> - if (error(coff->getSymbol(i, symbol))) return;<br>
> - if (error(coff->getSymbolName(symbol, name))) return;<br>
> - outs() << "[" << format("%2d", i) << "]"<br>
> - << "(sec " << format("%2d", int(symbol->SectionNumber)) << ")"<br>
> - << "(fl 0x00)" // Flag bits, which COFF doesn't have.<br>
> - << "(ty " << format("%3x", unsigned(symbol->Type)) << ")"<br>
> - << "(scl " << format("%3x", unsigned(symbol->StorageClass)) << ") "<br>
> - << "(nx " << unsigned(symbol->NumberOfAuxSymbols) << ") "<br>
> - << "0x" << format("%08x", unsigned(symbol->Value)) << " "<br>
> - << name << "\n";<br>
> - aux_count = symbol->NumberOfAuxSymbols;<br>
> }<br>
> }<br>
> }<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>
</div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br>Saleem Abdulrasool<br>compnerd (at) compnerd (dot) org
</div></div>