Skip to content

C
cpython
Commit dc5eff91 authored by Tim Peters's avatar Tim Peters
Browse files
Options

vgetargskeywords: Prevent another potential sprintf buffer overrun.

parent 62d48e17
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
Python/getargs.c
View file @ dc5eff91
...@@ -1027,7 +1027,7 @@ static int ...@@ -1027,7 +1027,7 @@ static int
vgetargskeywords(PyObject *args, PyObject *keywords, char *format, vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
char **kwlist, va_list *p_va) char **kwlist, va_list *p_va)
{ {
char msgbuf[256]; char msgbuf[512];
int levels[32]; int levels[32];
char *fname, *message; char *fname, *message;
int min, max; int min, max;
...@@ -1138,7 +1138,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format, ...@@ -1138,7 +1138,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
if (len < min || max < len) { if (len < min || max < len) {
if (message == NULL) { if (message == NULL) {
sprintf(msgbuf, sprintf(msgbuf,
"%s%s takes %s %d argument%s (%d given)", "%.200s%s takes %s %d argument%s (%d given)",
fname==NULL ? "function" : fname, fname==NULL ? "function" : fname,
fname==NULL ? "" : "()", fname==NULL ? "" : "()",
min==max ? "exactly" min==max ? "exactly"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7