From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 26 Jul 2015 06:07:53 +0000 (+0300)
Subject: Issue #24683: Fixed a crash in _json.make_encoder() called with non-dict 1st argument.
X-Git-Tag: v2.7.11rc1~224
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76a64ca4388493c8b518a256e3cc0e9b5ed3b3f3;p=thirdparty%2FPython%2Fcpython.git

Issue #24683: Fixed a crash in _json.make_encoder() called with non-dict 1st argument.
---

diff --git a/Modules/_json.c b/Modules/_json.c
index 121126d5ed78..5dac038902cb 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -1850,6 +1850,13 @@ encoder_init(PyObject *self, PyObject *args, PyObject *kwds)
     if (allow_nan < 0)
         return -1;
 
+    if (markers != Py_None && !PyDict_Check(markers)) {
+        PyErr_Format(PyExc_TypeError,
+                     "make_encoder() argument 1 must be dict or None, "
+                     "not %.200s", Py_TYPE(markers)->tp_name);
+        return -1;
+    }
+
     s->markers = markers;
     s->defaultfn = defaultfn;
     s->encoder = encoder;