diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-12-10 23:05:13 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-10 23:05:13 -0800 |
| commit | 62674f3a36ec55f86a5f20ee028a37fbd549bd6c (patch) | |
| tree | e0e54395611c4a6eca057ea673c2d515fe45cd3b /Modules/socketmodule.c | |
| parent | 3b9a0186c44d0c3e477c38fdc00203ec99aec912 (diff) | |
| download | cpython-git-62674f3a36ec55f86a5f20ee028a37fbd549bd6c.tar.gz | |
bpo-35454: Fix miscellaneous minor issues in error handling. (GH-11077)
* bpo-35454: Fix miscellaneous minor issues in error handling.
* Fix a null pointer dereference.
(cherry picked from commit 8905fcc85a6fc3ac394bc89b0bbf40897e9497a6)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Diffstat (limited to 'Modules/socketmodule.c')
| -rw-r--r-- | Modules/socketmodule.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 53bf996876..e6d3f8be6e 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -360,10 +360,14 @@ remove_unusable_flags(PyObject *m) else { if (PyDict_GetItemString( dict, - win_runtime_flags[i].flag_name) != NULL) { - PyDict_DelItemString( - dict, - win_runtime_flags[i].flag_name); + win_runtime_flags[i].flag_name) != NULL) + { + if (PyDict_DelItemString( + dict, + win_runtime_flags[i].flag_name)) + { + PyErr_Clear(); + } } } } |