mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-12 13:55:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to

Browse source 
use wrappers on all platforms, to make this as consistent as possible x-
platform (in particular, make sure there's at least one \0 byte in
the output buffer).  Also document more of the truth about what these do.

getargs.c, seterror():  Three computations of remaining buffer size were
backwards, thus telling PyOS_snprintf the buffer is larger than it
actually is.  This matters a lot now that PyOS_snprintf ensures there's a
trailing \0 byte (because it didn't get the truth about the buffer size,
it was storing \0 beyond the true end of the buffer).

sysmodule.c, mywrite():  Simplify, now that PyOS_vsnprintf guarantees to
produce a \0 byte.
This commit is contained in:
Tim Peters 2001-12-03 00:43:33 +00:00
parent 17d0154097
commit faad5ad590
4 changed files with 87 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Python/sysmodule.c
View file

@ -1025,18 +1025,11 @@ mywrite(char *name, FILE *fp, const char *format, va_list va)
char buffer[1001];
const int written = PyOS_vsnprintf(buffer, sizeof(buffer),
format, va);
const int trouble = written < 0 || written >= sizeof(buffer);
if (trouble) {
/* Ensure there's a trailing null byte -- MS
vsnprintf fills the buffer to the very end
if it's not big enough. */
buffer[sizeof(buffer) - 1] = '\0';
}
if (PyFile_WriteString(buffer, file) != 0) {
PyErr_Clear();
fputs(buffer, fp);
}
if (trouble) {
if (written < 0 || written >= sizeof(buffer)) {
const char *truncated = "... truncated";
if (PyFile_WriteString(truncated, file) != 0) {
PyErr_Clear();