diff options
author | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:05:50 -0800 |
---|---|---|
committer | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:05:50 -0800 |
commit | 3b0e4320092ac0504b6670cafaf0301b908c91fc (patch) | |
tree | d3be1b6b844d61763bb366fa21ceed475e5703fd /Modules/syslogmodule.c | |
parent | b2fa705fd3887c326e811c418469c784353027f4 (diff) | |
parent | f687fbcd73c14dfcbe086eb5cd94b298f1e81e72 (diff) | |
download | cpython-3b0e4320092ac0504b6670cafaf0301b908c91fc.tar.gz |
Issue #29392: Prevent crash when passing invalid arguments into msvcrt module.
Diffstat (limited to 'Modules/syslogmodule.c')
-rw-r--r-- | Modules/syslogmodule.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c index 7afca58d0e..a5807dcce9 100644 --- a/Modules/syslogmodule.c +++ b/Modules/syslogmodule.c @@ -116,7 +116,7 @@ syslog_openlog(PyObject * self, PyObject * args, PyObject *kwds) long facility = LOG_USER; PyObject *new_S_ident_o = NULL; static char *keywords[] = {"ident", "logoption", "facility", 0}; - char *ident = NULL; + const char *ident = NULL; if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Ull:openlog", keywords, &new_S_ident_o, &logopt, &facility)) @@ -147,8 +147,7 @@ syslog_openlog(PyObject * self, PyObject * args, PyObject *kwds) openlog(ident, logopt, facility); S_log_open = 1; - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } @@ -200,8 +199,7 @@ syslog_closelog(PyObject *self, PyObject *unused) Py_CLEAR(S_ident_o); S_log_open = 0; } - Py_INCREF(Py_None); - return Py_None; + Py_RETURN_NONE; } static PyObject * |