summaryrefslogtreecommitdiff
path: root/lib/ansible/vars
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2016-12-13 11:14:47 -0600
committerJames Cammarata <jimi@sngx.net>2017-01-09 10:43:03 -0600
commita6fff93967763c45370b2215f79a8050e6e6486a (patch)
treef8afb9ee06ddc1fe522c9df4d619e2b2644dea5b /lib/ansible/vars
parent258c6ada520e72b3040ad9729c8b95f11d5edc22 (diff)
downloadansible-a6fff93967763c45370b2215f79a8050e6e6486a.tar.gz
Fixing security bugs for CVE-2016-9587
Diffstat (limited to 'lib/ansible/vars')
-rw-r--r--lib/ansible/vars/unsafe_proxy.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ansible/vars/unsafe_proxy.py b/lib/ansible/vars/unsafe_proxy.py
index 4238d4d8e5..426410ab61 100644
--- a/lib/ansible/vars/unsafe_proxy.py
+++ b/lib/ansible/vars/unsafe_proxy.py
@@ -64,7 +64,6 @@ __all__ = ['UnsafeProxy', 'AnsibleUnsafe', 'AnsibleJSONUnsafeEncoder', 'AnsibleJ
class AnsibleUnsafe(object):
__UNSAFE__ = True
-
class AnsibleUnsafeText(text_type, AnsibleUnsafe):
pass
@@ -101,7 +100,7 @@ class AnsibleJSONUnsafeDecoder(json.JSONDecoder):
def _wrap_dict(v):
for k in v.keys():
if v[k] is not None:
- v[k] = wrap_var(v[k])
+ v[wrap_var(k)] = wrap_var(v[k])
return v