mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #19969: PyBytes_FromFormatV() now raises an OverflowError if "%c"

Browse source 
argument is not in range [0; 255].
This commit is contained in:
Victor Stinner 2013-12-13 12:14:44 +01:00
parent 3ad2d70947
commit c9362cf86a
3 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Objects/bytesobject.c
View file

@ -186,8 +186,17 @@ PyBytes_FromFormatV(const char *format, va_list vargs)
switch (*f) {
case 'c':
(void)va_arg(count, int);
/* fall through... */
{
int c = va_arg(count, int);
if (c < 0 || c > 255) {
PyErr_SetString(PyExc_OverflowError,
"PyBytes_FromFormatV(): %c format "
"expects an integer in range [0; 255]");
return NULL;
}
n++;
break;
}
case '%':
n++;
break;
@ -267,8 +276,12 @@ PyBytes_FromFormatV(const char *format, va_list vargs)
switch (*f) {
case 'c':
*s++ = va_arg(vargs, int);
{
int c = va_arg(vargs, int);
/* c has been checked for overflow in the first step */
*s++ = (unsigned char)c;
break;
}
case 'd':
if (longflag)
sprintf(s, "%ld", va_arg(vargs, long));