[Lldb-commits] [PATCH] D32421: Fix segfault resulting from empty print prompt

[Alex Langford via Phabricator via lldb-commits]

xiaobai updated this revision to Diff 97717.
xiaobai added a comment.

Moving test per @labath's suggestion


https://reviews.llvm.org/D32421

Files:
  packages/Python/lldbsuite/test/expression_command/multiline/TestMultilineExpressions.py
  source/Host/common/Editline.cpp


Index: source/Host/common/Editline.cpp
===================================================================
--- source/Host/common/Editline.cpp
+++ source/Host/common/Editline.cpp
@@ -367,7 +367,7 @@
   if (to == CursorLocation::EditingCursor) {
     toColumn =
         editline_cursor_position - (editline_cursor_row * m_terminal_width) + 1;
-  } else if (to == CursorLocation::BlockEnd) {
+  } else if (to == CursorLocation::BlockEnd && !m_input_lines.empty()) {
     toColumn =
         ((m_input_lines[m_input_lines.size() - 1].length() + GetPromptWidth()) %
          80) +
Index: packages/Python/lldbsuite/test/expression_command/multiline/TestMultilineExpressions.py
===================================================================
--- packages/Python/lldbsuite/test/expression_command/multiline/TestMultilineExpressions.py
+++ packages/Python/lldbsuite/test/expression_command/multiline/TestMultilineExpressions.py
@@ -60,3 +60,25 @@
         child.expect_exact(prompt)
         self.expect(child.before, exe=False,
                     patterns=['= 5'])
+
+        def test_empty_list(self):
+            """Test printing an empty list of expressions"""
+            import pexpect
+            prompt = "(lldb) "
+
+            # So that the child gets torn down after the test
+            self.child = pexpect.spawn(
+                    "%s %s" %
+                    (lldbtest_config.lldbExec, self.lldbOption))
+            child = self.child
+
+            # Turn on logging for what the child sends back.
+            if self.TraceOn():
+                child.logfile_read = sys.stdout
+
+            # We expect a prompt, then send "print" to start a list of expressions,
+            # then an empty line. We expect a prompt back.
+            child.expect_exact(prompt)
+            child.sendline("print")
+            child.sendline("\n")
+            child.expect_exact(prompt)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D32421.97717.patch
Type: text/x-patch
Size: 1904 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20170503/26477db1/attachment.bin>