Skip to content
Open
Changes from all commits
Commits
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
36 changes: 22 additions & 14 deletions Objects/bytesobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,18 @@
return (PyObject *) op;
}

static Py_ALWAYS_INLINE int
_assert_written(int len, Py_ssize_t max_len)

Check warning on line 236 in Objects/bytesobject.c

View workflow job for this annotation

GitHub Actions / Cross build Linux

‘always_inline’ function might not be inlinable unless also declared ‘inline’ [-Wattributes]

Check warning on line 236 in Objects/bytesobject.c

View workflow job for this annotation

GitHub Actions / Ubuntu (installed) / build, install and test

‘always_inline’ function might not be inlinable unless also declared ‘inline’ [-Wattributes]
{
assert(len >= 1);
assert(len < max_len);
return len;
}

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

static char*
bytes_fromformat(PyBytesWriter *writer, Py_ssize_t writer_pos,
Expand Down Expand Up @@ -324,41 +336,37 @@

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));
assert(1 <= len && len < (Py_ssize_t)sizeof(buffer));
len = SNPRINTF_BYTES(buffer, "%i", int);
WRITE_BYTES(buffer, len);
break;

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

Expand All @@ -382,8 +390,7 @@
}

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

#undef WRITE_BYTES
#undef SNPRINTF_BYTES
}


Expand Down
Loading