commit 9712113f8ba65a634a02cf863737e2e48a594524
author George Rimar <grimar@accesssoftek.com> Tue Feb 20 09:04:13 2018 +0000
committer George Rimar <grimar@accesssoftek.com> Tue Feb 20 09:04:13 2018 +0000
tree 2084cf6618c1708497c9d5ec80b2e67839c9de48
parent 2cede2e229edfcf5815842d41dec66deb9e100f9

[MC] - Don't crash on unclosed frame.

llvm-mc can crash when
there is cfi_startproc without cfi_end_proc:

.text
.globl foo
foo:
 .cfi_startproc

Testcase shows the issue, patch fixes it.

Differential revision: https://reviews.llvm.org/D43456

llvm-svn: 325564

llvm/lib/MC/MCStreamer.cpp

diff --git a/llvm/lib/MC/MCStreamer.cpp b/llvm/lib/MC/MCStreamer.cpp
index bc9c93f..a2c58e6 100644
--- a/llvm/lib/MC/MCStreamer.cpp
+++ b/llvm/lib/MC/MCStreamer.cpp
@@ -816,10 +816,11 @@
 }
 
 void MCStreamer::Finish() {
-  if (!DwarfFrameInfos.empty() && !DwarfFrameInfos.back().End)
+  if ((!DwarfFrameInfos.empty() && !DwarfFrameInfos.back().End) ||
+      (!WinFrameInfos.empty() && !WinFrameInfos.back()->End)) {
     getContext().reportError(SMLoc(), "Unfinished frame!");
-  if (!WinFrameInfos.empty() && !WinFrameInfos.back()->End)
-    getContext().reportError(SMLoc(), "Unfinished frame!");
+    return;
+  }
 
   MCTargetStreamer *TS = getTargetStreamer();
   if (TS)