From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 7 Oct 2017 20:52:57 +0000 (-0700)
Subject: [3.6] bpo-31655: Validate keyword names in SimpleNamespace constructor. (GH-3909... 
X-Git-Tag: v3.6.4rc1~180
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cae6e4775b37c412609d3a0d303c0831ff0012ff;p=thirdparty%2FPython%2Fcpython.git

[3.6] bpo-31655: Validate keyword names in SimpleNamespace constructor. (GH-3909) (#3920)

(cherry picked from commit 79ba471488b936abda5ba5234b1ea90cbc94cae6)
---

diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index d79429faf118..73fbdbf9b904 100644
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -1051,6 +1051,8 @@ class SimpleNamespaceTests(unittest.TestCase):
 
         with self.assertRaises(TypeError):
             types.SimpleNamespace(1, 2, 3)
+        with self.assertRaises(TypeError):
+            types.SimpleNamespace(**{1: 2})
 
         self.assertEqual(len(ns1.__dict__), 0)
         self.assertEqual(vars(ns1), {})
diff --git a/Objects/namespaceobject.c b/Objects/namespaceobject.c
index 0bb30638445a..d28c9133b4b7 100644
--- a/Objects/namespaceobject.c
+++ b/Objects/namespaceobject.c
@@ -50,8 +50,12 @@ namespace_init(_PyNamespaceObject *ns, PyObject *args, PyObject *kwds)
             return -1;
         }
     }
-    if (kwds == NULL)
+    if (kwds == NULL) {
         return 0;
+    }
+    if (!PyArg_ValidateKeywordArguments(kwds)) {
+        return -1;
+    }
     return PyDict_Update(ns->ns_dict, kwds);
 }