changeset:   92391:135fc23e475c
parent:      92389:e3a3c8809d09
parent:      92390:3ac9f9576ce6
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Wed Sep 10 23:32:36 2014 +0200
files:       Misc/NEWS
description:
(Merge 3.4) Issue #22338: Fix a crash in the json module on memory allocation
failure.


diff -r e3a3c8809d09 -r 135fc23e475c Misc/NEWS
--- a/Misc/NEWS	Wed Sep 10 17:13:36 2014 -0400
+++ b/Misc/NEWS	Wed Sep 10 23:32:36 2014 +0200
@@ -132,6 +132,8 @@
 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é.
 
diff -r e3a3c8809d09 -r 135fc23e475c Modules/_json.c
--- a/Modules/_json.c	Wed Sep 10 17:13:36 2014 -0400
+++ b/Modules/_json.c	Wed Sep 10 23:32:36 2014 +0200
@@ -287,7 +287,7 @@
             } \
         } \
         if (PyList_Append(chunks, chunk)) { \
-            Py_DECREF(chunk); \
+            Py_CLEAR(chunk); \
             goto bail; \
         } \
         Py_CLEAR(chunk); \
@@ -1555,6 +1555,7 @@
             if (item == NULL)
                 goto bail;
             PyList_SET_ITEM(items, i, item);
+            item = NULL;
             Py_DECREF(key);
         }
     }