Skip to content

gh-101703: Use PyOS_snprintf in bytesobject.c #161994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sobolevn wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −9
Open

gh-101703: Use PyOS_snprintf in bytesobject.c #161994

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions Objects/bytesobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,9 @@ bytes_fromformat(PyBytesWriter *writer, Py_ssize_t writer_pos,
s += _len; \
} while (0)

#define SNPRINTF_BYTES(BUFFER, PATTERN, TYP) \
PyOS_snprintf(BUFFER, sizeof(BUFFER), PATTERN, va_arg(vargs, TYP))

for (const char *f = format; *f; f++) {
if (*f != '%') {
*s++ = *f;
Expand Down Expand Up @@ -324,40 +327,40 @@ bytes_fromformat(PyBytesWriter *writer, Py_ssize_t writer_pos,

case 'd':
if (longflag) {
len = sprintf(buffer, "%ld", va_arg(vargs, long));
len = SNPRINTF_BYTES(buffer, "%ld", long);
}
else if (size_tflag) {
len = sprintf(buffer, "%zd", va_arg(vargs, Py_ssize_t));
len = SNPRINTF_BYTES(buffer, "%zd", Py_ssize_t);
}
else {
len = sprintf(buffer, "%d", va_arg(vargs, int));
len = SNPRINTF_BYTES(buffer, "%d", int);
}
assert(1 <= len && len < (Py_ssize_t)sizeof(buffer));
WRITE_BYTES(buffer, len);
break;

case 'u':
if (longflag) {
len = sprintf(buffer, "%lu", va_arg(vargs, unsigned long));
len = SNPRINTF_BYTES(buffer, "%lu", unsigned long);
}
else if (size_tflag) {
len = sprintf(buffer, "%zu", va_arg(vargs, size_t));
len = SNPRINTF_BYTES(buffer, "%zu", size_t);
}
else {
len = sprintf(buffer, "%u", va_arg(vargs, unsigned int));
len = SNPRINTF_BYTES(buffer, "%u", unsigned int);
}
assert(1 <= len && len < (Py_ssize_t)sizeof(buffer));
WRITE_BYTES(buffer, len);
break;

case 'i':
len = sprintf(buffer, "%i", va_arg(vargs, int));
len = SNPRINTF_BYTES(buffer, "%i", int);
assert(1 <= len && len < (Py_ssize_t)sizeof(buffer));
WRITE_BYTES(buffer, len);
break;

case 'x':
len = sprintf(buffer, "%x", va_arg(vargs, int));
len = SNPRINTF_BYTES(buffer, "%x", int);
assert(1 <= len && len < (Py_ssize_t)sizeof(buffer));
WRITE_BYTES(buffer, len);
break;
Expand All @@ -382,7 +385,7 @@ bytes_fromformat(PyBytesWriter *writer, Py_ssize_t writer_pos,
}

case 'p':
len = sprintf(buffer, "%p", va_arg(vargs, void*));
len = SNPRINTF_BYTES(buffer, "%p", void*);
assert(1 <= len && len < (Py_ssize_t)sizeof(buffer));
/* %p is ill-defined: ensure leading 0x. */
if (buffer[1] == 'X') {
Expand Down Expand Up @@ -415,6 +418,7 @@ bytes_fromformat(PyBytesWriter *writer, Py_ssize_t writer_pos,
return s;

#undef WRITE_BYTES
#undef SNPRINTF_BYTES
}


Expand Down
Loading