From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 10 Sep 2014 21:32:36 +0000 (+0200)
Subject: (Merge 3.4) Issue #22338: Fix a crash in the json module on memory allocation
X-Git-Tag: v3.5.0a1~935
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ebf9106129e59e54a852cd7643510d85a30840e;p=python

(Merge 3.4) Issue #22338: Fix a crash in the json module on memory allocation
failure.
---

8ebf9106129e59e54a852cd7643510d85a30840e
diff --cc Misc/NEWS
index 4dd8de39b3,91125e708d..49909a103b
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -132,15 -32,8 +132,17 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #22338: Fix a crash in the json module on memory allocation failure.
+ 
 +- Issue #12410: imaplib.IMAP4 now supports the context management protocol.
 +  Original patch by Tarek Ziadé.
 +
 +- Issue #16662: load_tests() is now unconditionally run when it is present in
 +  a package's __init__.py.  TestLoader.loadTestsFromModule() still accepts
 +  use_load_tests, but it is deprecated and ignored.  A new keyword-only
 +  attribute `pattern` is added and documented.  Patch given by Robert Collins,
 +  tweaked by Barry Warsaw.
 +
  - Issue #22226: First letter no longer is stripped from the "status" key in
    the result of Treeview.heading().