diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:05:40 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:05:40 -0800 |
| commit | b2fa705fd3887c326e811c418469c784353027f4 (patch) | |
| tree | b3428f73de91453edbfd4df1a5d4a212d182eb44 /Modules/_scproxy.c | |
| parent | 134e58fd3aaa2e91390041e143f3f0a21a60142b (diff) | |
| parent | b53654b6dbfce8318a7d4d1cdaddca7a7fec194b (diff) | |
| download | cpython-b2fa705fd3887c326e811c418469c784353027f4.tar.gz | |
Issue #29392: Prevent crash when passing invalid arguments into msvcrt module.
Diffstat (limited to 'Modules/_scproxy.c')
| -rw-r--r-- | Modules/_scproxy.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Modules/_scproxy.c b/Modules/_scproxy.c index 66b6e3439f..1ce4b776f3 100644 --- a/Modules/_scproxy.c +++ b/Modules/_scproxy.c @@ -71,16 +71,12 @@ get_proxy_settings(PyObject* mod __attribute__((__unused__))) result = PyDict_New(); if (result == NULL) goto error; - if (&kSCPropNetProxiesExcludeSimpleHostnames != NULL) { - aNum = CFDictionaryGetValue(proxyDict, - kSCPropNetProxiesExcludeSimpleHostnames); - if (aNum == NULL) { - v = PyBool_FromLong(0); - } else { - v = PyBool_FromLong(cfnum_to_int32(aNum)); - } - } else { + aNum = CFDictionaryGetValue(proxyDict, + kSCPropNetProxiesExcludeSimpleHostnames); + if (aNum == NULL) { v = PyBool_FromLong(0); + } else { + v = PyBool_FromLong(cfnum_to_int32(aNum)); } if (v == NULL) goto error; @@ -130,7 +126,7 @@ error: } static int -set_proxy(PyObject* proxies, char* proto, CFDictionaryRef proxyDict, +set_proxy(PyObject* proxies, const char* proto, CFDictionaryRef proxyDict, CFStringRef enabledKey, CFStringRef hostKey, CFStringRef portKey) { |