From a8cfc29c9a3e39a18f576a2820a7a259654fe953 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Wed, 14 Jun 2017 15:59:27 +0000 Subject: Resubmit "[codeview] Make obj2yaml/yaml2obj support .debug$S..." This was originally reverted because of some non-deterministic failures on certain buildbots. Luckily ASAN eventually caught this as a stack-use-after-scope, so the fix is included in this patch. llvm-svn: 305393 --- llvm/lib/DebugInfo/CodeView/DebugStringTableSubsection.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'llvm/lib/DebugInfo/CodeView/DebugStringTableSubsection.cpp') diff --git a/llvm/lib/DebugInfo/CodeView/DebugStringTableSubsection.cpp b/llvm/lib/DebugInfo/CodeView/DebugStringTableSubsection.cpp index 6e647c4..de02525 100644 --- a/llvm/lib/DebugInfo/CodeView/DebugStringTableSubsection.cpp +++ b/llvm/lib/DebugInfo/CodeView/DebugStringTableSubsection.cpp @@ -58,6 +58,10 @@ Error DebugStringTableSubsection::commit(BinaryStreamWriter &Writer) const { uint32_t Begin = Writer.getOffset(); uint32_t End = Begin + StringSize; + // Write a null string at the beginning. + if (auto EC = Writer.writeCString(StringRef())) + return EC; + for (auto &Pair : Strings) { StringRef S = Pair.getKey(); uint32_t Offset = Begin + Pair.getValue(); @@ -68,6 +72,7 @@ Error DebugStringTableSubsection::commit(BinaryStreamWriter &Writer) const { } Writer.setOffset(End); + assert((End - Begin) == StringSize); return Error::success(); } -- cgit v1.1