From 8a8ef4917e785ae328d6a58ad5e40e430303ada6 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 15 Nov 2017 14:33:39 +0200
Subject: [PATCH 1/2] bpo-31829: Make protocol 0 pickles be loadable in text
 mode in Python 2.

Escape ``\r``, ``\0`` and ``\x1a`` (end-of-file on Windows) in Unicode strings.
---
 Lib/pickle.py                                 |  3 +++
 Lib/test/pickletester.py                      | 19 +++++++++++++++----
 .../2017-10-21-12-07-56.bpo-31829.6IhP-O.rst  |  3 +++
 Modules/_pickle.c                             |  5 ++++-
 4 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2017-10-21-12-07-56.bpo-31829.6IhP-O.rst

diff --git a/Lib/pickle.py b/Lib/pickle.py
index d533e660af3b23..e9ae8cfb3cdbdf 100644
--- a/Lib/pickle.py
+++ b/Lib/pickle.py
@@ -745,7 +745,10 @@ def save_str(self, obj):
                 self.write(BINUNICODE + pack("<I", n) + encoded)
         else:
             obj = obj.replace("\\", "\\u005c")
+            obj = obj.replace("\0", "\\u0000")
             obj = obj.replace("\n", "\\u000a")
+            obj = obj.replace("\r", "\\u000d")
+            obj = obj.replace("\x1a", "\\u001a")  # EOF on DOS
             self.write(UNICODE + obj.encode('raw-unicode-escape') +
                        b'\n')
         self.memoize(obj)
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
index 71c2feadb613d2..c01baa902dc4d0 100644
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -2644,22 +2644,20 @@ def __getattr__(self, key):
 class AbstractPickleModuleTests(unittest.TestCase):
 
     def test_dump_closed_file(self):
-        import os
         f = open(TESTFN, "wb")
         try:
             f.close()
             self.assertRaises(ValueError, self.dump, 123, f)
         finally:
-            os.remove(TESTFN)
+            support.unlink(TESTFN)
 
     def test_load_closed_file(self):
-        import os
         f = open(TESTFN, "wb")
         try:
             f.close()
             self.assertRaises(ValueError, self.dump, 123, f)
         finally:
-            os.remove(TESTFN)
+            support.unlink(TESTFN)
 
     def test_load_from_and_dump_to_file(self):
         stream = io.BytesIO()
@@ -2683,6 +2681,19 @@ def test_callapi(self):
         self.Pickler(f, -1)
         self.Pickler(f, protocol=-1)
 
+    def test_dump_text_file(self):
+        f = open(TESTFN, "w")
+        try:
+            for proto in protocols:
+                self.assertRaises(TypeError, self.dump, 123, f, proto)
+        finally:
+            f.close()
+            support.unlink(TESTFN)
+
+    def test_incomplete_input(self):
+        s = io.BytesIO(b"X''.")
+        self.assertRaises((EOFError, struct.error, pickle.UnpicklingError), self.load, s)
+
     def test_bad_init(self):
         # Test issue3664 (pickle can segfault from a badly initialized Pickler).
         # Override initialization without calling __init__() of the superclass.
diff --git a/Misc/NEWS.d/next/Library/2017-10-21-12-07-56.bpo-31829.6IhP-O.rst b/Misc/NEWS.d/next/Library/2017-10-21-12-07-56.bpo-31829.6IhP-O.rst
new file mode 100644
index 00000000000000..aefb8aec16fd11
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-10-21-12-07-56.bpo-31829.6IhP-O.rst
@@ -0,0 +1,3 @@
+``\r``, ``\0`` and ``\x1a`` (end-of-file on Windows) are now escaped in
+protocol 0 pickles of Unicode strings. This allows to load them without loss
+from files open in text mode in Python 2.
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 58cd09ca61a65d..cd3f3664b0fcc4 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -2336,7 +2336,10 @@ raw_unicode_escape(PyObject *obj)
             *p++ = Py_hexdigits[ch & 15];
         }
         /* Map 16-bit characters, '\\' and '\n' to '\uxxxx' */
-        else if (ch >= 256 || ch == '\\' || ch == '\n') {
+        else if (ch >= 256 ||
+                 ch == '\\'  || ch == 0 || ch == '\n' || ch == '\r' ||
+                 ch == 0x1a)
+        {
             /* -1: subtract 1 preallocated byte */
             p = _PyBytesWriter_Prepare(&writer, p, 6-1);
             if (p == NULL)

From 7ac084d9afc02e113db7226b18b96f730d677034 Mon Sep 17 00:00:00 2001
From: Zackery Spytz <zspytz@gmail.com>
Date: Sat, 6 Apr 2019 12:24:28 +0300
Subject: [PATCH 2/2] Update Modules/_pickle.c

Co-Authored-By: serhiy-storchaka <storchaka@gmail.com>
---
 Modules/_pickle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index cd3f3664b0fcc4..85dab14738de03 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -2337,7 +2337,7 @@ raw_unicode_escape(PyObject *obj)
         }
         /* Map 16-bit characters, '\\' and '\n' to '\uxxxx' */
         else if (ch >= 256 ||
-                 ch == '\\'  || ch == 0 || ch == '\n' || ch == '\r' ||
+                 ch == '\\' || ch == 0 || ch == '\n' || ch == '\r' ||
                  ch == 0x1a)
         {
             /* -1: subtract 1 preallocated byte */