summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVáclav Bartoš <bartos@cesnet.cz>2020-01-14 17:57:04 (GMT)
committerMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2020-01-14 17:57:04 (GMT)
commitf04750bb7af45cb6efab8d92d1ff063f0bf2833d (patch)
treefb9282def221ac75d67a74b0ad7d790b68caf4a5
parentb6791375b2ff86ea07f068fb53d9575c337eaa5b (diff)
downloadcpython-f04750bb7af45cb6efab8d92d1ff063f0bf2833d.zip
cpython-f04750bb7af45cb6efab8d92d1ff063f0bf2833d.tar.gz
cpython-f04750bb7af45cb6efab8d92d1ff063f0bf2833d.tar.bz2
bpo-38361: syslog: fixed making default "ident" from sys.argv[0] (GH-16557)
The default value of "ident" parameter should be sys.argv[0] with leading path components stripped, but it contained the last slash, i.e. '/program' instead of 'program'. BPO issue: https://bugs.python.org/issue38361 https://bugs.python.org/issue38361
-rw-r--r--Misc/NEWS.d/next/Library/2019-10-04-09-49-56.bpo-38361.LM4u4T.rst1
-rw-r--r--Modules/syslogmodule.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Misc/NEWS.d/next/Library/2019-10-04-09-49-56.bpo-38361.LM4u4T.rst b/Misc/NEWS.d/next/Library/2019-10-04-09-49-56.bpo-38361.LM4u4T.rst
new file mode 100644
index 0000000..65186db
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-10-04-09-49-56.bpo-38361.LM4u4T.rst
@@ -0,0 +1 @@
+Fixed an issue where ``ident`` could include a leading path separator when :func:`syslog.openlog` was called without arguments. \ No newline at end of file
diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c
index b2ea73b..539224f 100644
--- a/Modules/syslogmodule.c
+++ b/Modules/syslogmodule.c
@@ -99,7 +99,7 @@ syslog_get_argv(void)
if (slash == -2)
return NULL;
if (slash != -1) {
- return PyUnicode_Substring(scriptobj, slash, scriptlen);
+ return PyUnicode_Substring(scriptobj, slash + 1, scriptlen);
} else {
Py_INCREF(scriptobj);
return(scriptobj);