From 17ae760ad7359725b572439747c0efcc5cb0abc0 Mon Sep 17 00:00:00 2001 From: Bert JW Regeer Date: Mon, 27 Dec 2021 01:48:47 -0700 Subject: Close old buffer when overflowing in OverflowableBuffer When switching from a BytesIO to a file backed buffer, we were not closing the old buffer after we had copied its contents. With this change when we switch from a small buffer to a larger buffer or vice-versa we will now attempt to close the old buffer. --- src/waitress/buffers.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/waitress/buffers.py b/src/waitress/buffers.py index 0086fe8..386eb40 100644 --- a/src/waitress/buffers.py +++ b/src/waitress/buffers.py @@ -234,11 +234,23 @@ class OverflowableBuffer: return buf def _set_small_buffer(self): - self.buf = BytesIOBasedBuffer(self.buf) + oldbuf = self.buf + self.buf = BytesIOBasedBuffer(oldbuf) + + # Attempt to close the old buffer + if hasattr(oldbuf, "close"): + oldbuf.close() + self.overflowed = False def _set_large_buffer(self): - self.buf = TempfileBasedBuffer(self.buf) + oldbuf = self.buf + self.buf = TempfileBasedBuffer(oldbuf) + + # Attempt to close the old buffer + if hasattr(oldbuf, "close"): + oldbuf.close() + self.overflowed = True def append(self, s): -- cgit v1.2.1