merge 3.2 (closes #23165)

diff --cc Misc/NEWS
index c66da32f9e7394a61f500720e678800ab3138537,e84186259d9023ed0e37d48f7cdf1ba8ebf7d1fe..b853c699279e2e0fe798ca742aeea1c260ffdf95
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,19 -10,12 +10,22 @@@ What's New in Python 3.3.6
  Core and Builtins
  -----------------
  
 -- Issue #19529: Fix a potential crash in converting Unicode objects to wchar_t
 -  when Py_UNICODE is 4 bytes but wchar_t is 2 bytes, for example on AIX.
 -
 +- Issue #22643: Fix integer overflow in Unicode case operations (upper, lower,
 +  title, swapcase, casefold).
 +
 +- Issue #22518: Fixed integer overflow issues in "backslashreplace",
 +  "xmlcharrefreplace", and "surrogatepass" error handlers.
 +
 +- Issue #22520: Fix overflow checking when generating the repr of a unicode
 +  object.
 +
 +- Issue #22519: Fix overflow checking in PyBytes_Repr.
 +
 +- Issue #22518: Fix integer overflow issues in latin-1 encoding.
 +
+ - Issue #23165: Perform overflow checks before allocating memory in the
+   _Py_char2wchar function.
+ 
  Library
  -------
  

diff --cc Python/fileutils.c
Simple merge