Skip to content

Commit 6122dec

Browse files
committed
gh-101703: Use PyOS_snprintf in bytesobject.c
1 parent 1d64195 commit 6122dec

1 file changed

Lines changed: 13 additions & 9 deletions

File tree

‎Objects/bytesobject.c‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,9 @@ bytes_fromformat(PyBytesWriter *writer, Py_ssize_t writer_pos,
265265
s += _len; \
266266
} while (0)
267267

268+
#define SNPRINTF_BYTES(BUFFER, PATTERN, TYP) \
269+
PyOS_snprintf(BUFFER, sizeof(BUFFER), PATTERN, va_arg(vargs, TYP))
270+
268271
for (const char *f = format; *f; f++) {
269272
if (*f != '%') {
270273
*s++ = *f;
@@ -324,40 +327,40 @@ bytes_fromformat(PyBytesWriter *writer, Py_ssize_t writer_pos,
324327

325328
case 'd':
326329
if (longflag) {
327-
len = sprintf(buffer, "%ld", va_arg(vargs, long));
330+
len = SNPRINTF_BYTES(buffer, "%ld", long);
328331
}
329332
else if (size_tflag) {
330-
len = sprintf(buffer, "%zd", va_arg(vargs, Py_ssize_t));
333+
len = SNPRINTF_BYTES(buffer, "%zd", Py_ssize_t);
331334
}
332335
else {
333-
len = sprintf(buffer, "%d", va_arg(vargs, int));
336+
len = SNPRINTF_BYTES(buffer, "%d", int);
334337
}
335338
assert(1 <= len && len < (Py_ssize_t)sizeof(buffer));
336339
WRITE_BYTES(buffer, len);
337340
break;
338341

339342
case 'u':
340343
if (longflag) {
341-
len = sprintf(buffer, "%lu", va_arg(vargs, unsigned long));
344+
len = SNPRINTF_BYTES(buffer, "%lu", unsigned long);
342345
}
343346
else if (size_tflag) {
344-
len = sprintf(buffer, "%zu", va_arg(vargs, size_t));
347+
len = SNPRINTF_BYTES(buffer, "%zu", size_t);
345348
}
346349
else {
347-
len = sprintf(buffer, "%u", va_arg(vargs, unsigned int));
350+
len = SNPRINTF_BYTES(buffer, "%u", unsigned int);
348351
}
349352
assert(1 <= len && len < (Py_ssize_t)sizeof(buffer));
350353
WRITE_BYTES(buffer, len);
351354
break;
352355

353356
case 'i':
354-
len = sprintf(buffer, "%i", va_arg(vargs, int));
357+
len = SNPRINTF_BYTES(buffer, "%i", int);
355358
assert(1 <= len && len < (Py_ssize_t)sizeof(buffer));
356359
WRITE_BYTES(buffer, len);
357360
break;
358361

359362
case 'x':
360-
len = sprintf(buffer, "%x", va_arg(vargs, int));
363+
len = SNPRINTF_BYTES(buffer, "%x", int);
361364
assert(1 <= len && len < (Py_ssize_t)sizeof(buffer));
362365
WRITE_BYTES(buffer, len);
363366
break;
@@ -382,7 +385,7 @@ bytes_fromformat(PyBytesWriter *writer, Py_ssize_t writer_pos,
382385
}
383386

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

417420
#undef WRITE_BYTES
421+
#undef SNPRINTF_BYTES
418422
}
419423

420424

0 commit comments

Comments
 (0)