Safely decode if the input or the buffer is None.

Giovanni Siragusa · Giovanni Siragusa · commit 74e239d79545 · 2024-07-13T15:58:50.000+02:00
diff --git a/Lib/codecs.py b/Lib/codecs.py
@@ -321,7 +321,13 @@ def _buffer_decode(self, input, errors, final):
 
     def decode(self, input, final=False):
         # decode input (taking the buffer into account)
-        data = self.buffer + input
+        data = b''
+        if input is not None:
+            data += input
+
+        if self.buffer is not None:
+            data += self.buffer
+
         (result, consumed) = self._buffer_decode(data, self.errors, final)
         # keep undecoded input until the next call
         self.buffer = data[consumed:]
