Allow setting environment for readline tests

bpo-29854: Add failing test that crash readline
bpo-29854: Fix segfault in call_readline()
python · berkerpeksag · Jul 7, 2017 · berkerpeksag · Jul 7, 2017 · nirs
diff --git a/Modules/readline.c b/Modules/readline.c
-            line = (const char *)history_get(length)->line;
-        else
+                hist_ent = history_get(length);
+            line = (const char *)hist_ent ? hist_ent->line : "";
diff --git a/Modules/readline.c b/Modules/readline.c
-        else
+                hist_ent = history_get(length);
+            line = (const char *)hist_ent ? hist_ent->line : "";
+        } else
diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
+import readline
+import sys
+
+history_file = "{}"
diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
+
+            script = """
+import readline
+import sys
diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
+            inputrc = os.path.join(temp_dir, "inputrc")
+            with io.open(inputrc, "wb") as f:
+                f.write(b"set history-size %d\n" % history_size)
+            env = os.environ.copy()
diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
+            self.assertEqual(len(lines), history_size)
+            self.assertEqual(lines[-1].strip(), b"last input")
+        finally:
+            shutil.rmtree(temp_dir)
diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
+        temp_dir = tempfile.mkdtemp()
+        try:
+            inputrc = os.path.join(temp_dir, "inputrc")
+            with io.open(inputrc, "wb") as f:
diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
+readline.read_history_file(history_file)
+input()
+readline.write_history_file(history_file)
+""".format(history_file)
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -322,6 +322,9 @@ Core and Builtins
 Extension Modules
 -----------------

+- bpo-29854: Fix segfault in readline when using readline's history-size
+  option.
diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
+        temp_dir = tempfile.mkdtemp()
+        try:
+            inputrc = os.path.join(temp_dir, "inputrc")
+            with io.open(inputrc, "wb") as f:
diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
+        try:
+            inputrc = os.path.join(temp_dir, "inputrc")
+            with io.open(inputrc, "wb") as f:
+                f.write(b"set history-size %d\n" % history_size)
diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
+            self.assertEqual(len(lines), history_size)
+            self.assertEqual(lines[-1].strip(), b"last input")
+        finally:
+            shutil.rmtree(temp_dir)