mirror of
https://github.com/python/cpython.git
synced 2025-07-16 07:45:20 +00:00
vgetargskeywords: Prevent another potential sprintf buffer overrun.
This commit is contained in:
parent
62d48e1735
commit
dc5eff9170
1 changed files with 2 additions and 2 deletions
|
@ -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,
|
||||||
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"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue