From a450398933d265011e1e8eae7f771b70f97945fb Mon Sep 17 00:00:00 2001
From: AngstyDuck <solsticedante@gmail.com>
Date: Sat, 2 Oct 2021 04:11:08 +0800
Subject: [PATCH] bpo-44687: Ensure BufferedReader objects with unread buffers
 can peek even when the underlying file is closed (GH-28457)

---
 .../next/C API/2021-09-19-17-18-25.bpo-44687.3fqDRC.rst   | 1 +
 Modules/_io/bufferedio.c                                  | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 Misc/NEWS.d/next/C API/2021-09-19-17-18-25.bpo-44687.3fqDRC.rst

diff --git a/Misc/NEWS.d/next/C API/2021-09-19-17-18-25.bpo-44687.3fqDRC.rst b/Misc/NEWS.d/next/C API/2021-09-19-17-18-25.bpo-44687.3fqDRC.rst
new file mode 100644
index 00000000000..d38fa6057f6
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2021-09-19-17-18-25.bpo-44687.3fqDRC.rst	
@@ -0,0 +1 @@
+:meth:`BufferedReader.peek` no longer raises :exc:`ValueError` when the entire file has already been buffered.
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c
index 5984d34cc08..ba966f568b3 100644
--- a/Modules/_io/bufferedio.c
+++ b/Modules/_io/bufferedio.c
@@ -341,11 +341,10 @@ _enter_buffered_busy(buffered *self)
      : buffered_closed(self)))
 
 #define CHECK_CLOSED(self, error_msg) \
-    if (IS_CLOSED(self)) { \
+    if (IS_CLOSED(self) & (Py_SAFE_DOWNCAST(READAHEAD(self), Py_off_t, Py_ssize_t) == 0)) { \
         PyErr_SetString(PyExc_ValueError, error_msg); \
         return NULL; \
-    }
-
+    } \
 
 #define VALID_READ_BUFFER(self) \
     (self->readable && self->read_end != -1)
@@ -530,6 +529,9 @@ buffered_close(buffered *self, PyObject *args)
         Py_CLEAR(res);
     }
 
+    self->read_end = 0;
+    self->pos = 0;
+
 end:
     LEAVE_BUFFERED(self)
     return res;