cpython-lru_cache-weakref: Python/mysnprintf.c annotate

annotate Python/mysnprintf.c @ 42775:d7517c306791

Merged revisions 57221-57391 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r57227 | facundo.batista | 2007-08-20 17:16:21 -0700 (Mon, 20 Aug 2007) | 5 lines Catch ProtocolError exceptions and include the header information in test output (to make it easier to debug test failures caused by problems in the server). [GSoC - Alan McIntyre] ........ r57229 | mark.hammond | 2007-08-20 18:04:47 -0700 (Mon, 20 Aug 2007) | 5 lines [ 1761786 ] distutils.util.get_platform() return value on 64bit Windows As discussed on distutils-sig: Allows the generated installer name on 64bit Windows platforms to be different than the name generated for 32bit Windows platforms. ........ r57230 | mark.hammond | 2007-08-20 18:05:16 -0700 (Mon, 20 Aug 2007) | 5 lines [ 1761786 ] distutils.util.get_platform() return value on 64bit Windows As discussed on distutils-sig: Allows the generated installer name on 64bit Windows platforms to be different than the name generated for 32bit Windows platforms. ........ r57253 | georg.brandl | 2007-08-20 23:01:18 -0700 (Mon, 20 Aug 2007) | 2 lines Demand version 2.5.1 since 2.5 has a bug with codecs.open context managers. ........ r57254 | georg.brandl | 2007-08-20 23:03:43 -0700 (Mon, 20 Aug 2007) | 2 lines Revert accidental checkins from last commit. ........ r57255 | georg.brandl | 2007-08-20 23:07:08 -0700 (Mon, 20 Aug 2007) | 2 lines Bug #1777160: mention explicitly that e.g. -1**2 is -1. ........ r57256 | georg.brandl | 2007-08-20 23:12:19 -0700 (Mon, 20 Aug 2007) | 3 lines Bug #1777168: replace operator names "opa"... with "op1"... and mark everything up as literal, to enhance readability. ........ r57259 | facundo.batista | 2007-08-21 09:57:18 -0700 (Tue, 21 Aug 2007) | 8 lines Added test for behavior of operations on an unconnected SMTP object, and tests for NOOP, RSET, and VRFY. Corrected typo in a comment for testNonnumericPort. Added a check for constructing SMTP objects when non-numeric ports are included in the host name. Derived a server from SMTPServer to test various ESMTP/SMTP capabilities. Check that a second HELO to DebuggingServer returns an error. [GSoC - Alan McIntyre] ........ r57279 | skip.montanaro | 2007-08-22 12:02:16 -0700 (Wed, 22 Aug 2007) | 2 lines Note that BeOS is unsupported as of Python 2.6. ........ r57280 | skip.montanaro | 2007-08-22 12:05:21 -0700 (Wed, 22 Aug 2007) | 1 line whoops - need to check in configure as well ........ r57284 | alex.martelli | 2007-08-22 14:14:17 -0700 (Wed, 22 Aug 2007) | 5 lines Fix compile.c so that it records 0.0 and -0.0 as separate constants in a code object's co_consts tuple; add a test to show that the previous behavior (where these two constants were "collapsed" into one) causes serious malfunctioning. ........ r57286 | gregory.p.smith | 2007-08-22 14:32:34 -0700 (Wed, 22 Aug 2007) | 3 lines stop leaving log.0000001 __db.00* and xxx.db turds in developer sandboxes when bsddb3 tests are run. ........ r57301 | jeffrey.yasskin | 2007-08-22 16:14:27 -0700 (Wed, 22 Aug 2007) | 3 lines When setup.py fails to find the necessary bits to build some modules, have it print a slightly more informative message. ........ r57320 | brett.cannon | 2007-08-23 07:53:17 -0700 (Thu, 23 Aug 2007) | 2 lines Make test_runpy re-entrant. ........ r57324 | georg.brandl | 2007-08-23 10:54:11 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1768121: fix wrong/missing opcode docs. ........ r57326 | georg.brandl | 2007-08-23 10:57:05 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1766421: "return code" vs. "status code". ........ r57328 | georg.brandl | 2007-08-23 11:08:06 -0700 (Thu, 23 Aug 2007) | 2 lines Second half of #1752175: #ifdef out references to PyImport_DynLoadFiletab if HAVE_DYNAMIC_LOADING is not defined. ........ r57331 | georg.brandl | 2007-08-23 11:11:33 -0700 (Thu, 23 Aug 2007) | 2 lines Use try-except-finally in contextlib. ........ r57343 | georg.brandl | 2007-08-23 13:35:00 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1697820: document that the old slice protocol is still used by builtin types. ........ r57345 | georg.brandl | 2007-08-23 13:40:01 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1573854: fix docs for sqlite3 cursor rowcount attr. ........ r57347 | georg.brandl | 2007-08-23 13:50:23 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1694833: fix imp.find_module() docs wrt. packages. ........ r57348 | georg.brandl | 2007-08-23 13:53:28 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1594966: fix misleading usage example ........ r57349 | georg.brandl | 2007-08-23 13:55:44 -0700 (Thu, 23 Aug 2007) | 2 lines Clarify wording a bit. ........ r57351 | georg.brandl | 2007-08-23 14:18:44 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1752332: httplib no longer uses socket.getaddrinfo(). ........ r57352 | georg.brandl | 2007-08-23 14:21:36 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1734111: document struct.Struct.size. ........ r57353 | georg.brandl | 2007-08-23 14:27:57 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1688564: document os.path.join's absolute path behavior in the docstring. ........ r57354 | georg.brandl | 2007-08-23 14:36:05 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1625381: clarify match vs search introduction. ........ r57355 | georg.brandl | 2007-08-23 14:42:54 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1758696: more info about descriptors. ........ r57357 | georg.brandl | 2007-08-23 14:55:57 -0700 (Thu, 23 Aug 2007) | 2 lines Patch #1779550: remove redundant code in logging. ........ r57378 | gregory.p.smith | 2007-08-23 22:11:38 -0700 (Thu, 23 Aug 2007) | 2 lines Fix bug 1725856. ........ r57382 | georg.brandl | 2007-08-23 23:10:01 -0700 (Thu, 23 Aug 2007) | 2 lines uuid creation is now threadsafe, backport from py3k rev. 57375. ........ r57389 | georg.brandl | 2007-08-24 04:47:37 -0700 (Fri, 24 Aug 2007) | 2 lines Bug #1765375: fix stripping of unwanted LDFLAGS. ........ r57391 | guido.van.rossum | 2007-08-24 07:53:14 -0700 (Fri, 24 Aug 2007) | 2 lines Fix silly typo in test name. ........

author	Guido van Rossum <guido@python.org>
date	Fri, 24 Aug 2007 16:32:05 +0000
parents	8af86a952b2c
children	2925b568aacc a8cc8e6f0c1a

rev	line source
18908 79c676f9b34a This patch turns the Python API mismatch notice into a standard Marc-André Lemburg <mal@egenix.com> parents: diff changeset	1 #include "Python.h"
79c676f9b34a This patch turns the Python API mismatch notice into a standard Marc-André Lemburg <mal@egenix.com> parents: diff changeset	2 #include <ctype.h>
79c676f9b34a This patch turns the Python API mismatch notice into a standard Marc-André Lemburg <mal@egenix.com> parents: diff changeset	3
21145 87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	4 /* snprintf() wrappers. If the platform has vsnprintf, we use it, else we
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	5 emulate it in a half-hearted way. Even if the platform has it, we wrap
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	6 it because platforms differ in what vsnprintf does in case the buffer
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	7 is too small: C99 behavior is to return the number of characters that
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	8 would have been written had the buffer not been too small, and to set
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	9 the last byte of the buffer to \0. At least MS _vsnprintf returns a
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	10 negative value instead, and fills the entire buffer with non-\0 data.
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	11
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	12 The wrappers ensure that str[size-1] is always \0 upon return.
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	13
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	14 PyOS_snprintf and PyOS_vsnprintf never write more than size bytes
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	15 (including the trailing '\0') into str.
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	16
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	17 If the platform doesn't have vsnprintf, and the buffer size needed to
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	18 avoid truncation exceeds size by more than 512, Python aborts with a
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	19 Py_FatalError.
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	20
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	21 Return value (rv):
18908 79c676f9b34a This patch turns the Python API mismatch notice into a standard Marc-André Lemburg <mal@egenix.com> parents: diff changeset	22
21145 87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	23 When 0 <= rv < size, the output conversion was unexceptional, and
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	24 rv characters were written to str (excluding a trailing \0 byte at
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	25 str[rv]).
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	26
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	27 When rv >= size, output conversion was truncated, and a buffer of
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	28 size rv+1 would have been needed to avoid truncation. str[size-1]
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	29 is \0 in this case.
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	30
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	31 When rv < 0, "something bad happened". str[size-1] is \0 in this
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	32 case too, but the rest of str is unreliable. It could be that
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	33 an error in format codes was detected by libc, or on platforms
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	34 with a non-C99 vsnprintf simply that the buffer wasn't big enough
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	35 to avoid truncation, or on platforms without any vsnprintf that
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	36 PyMem_Malloc couldn't obtain space for a temp buffer.
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	37
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	38 CAUTION: Unlike C99, str != NULL and size > 0 are required.
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	39 */
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	40
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	41 int
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	42 PyOS_snprintf(char str, size_t size, const char format, ...)
18908 79c676f9b34a This patch turns the Python API mismatch notice into a standard Marc-André Lemburg <mal@egenix.com> parents: diff changeset	43 {
21145 87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	44 int rc;
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	45 va_list va;
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	46
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	47 va_start(va, format);
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	48 rc = PyOS_vsnprintf(str, size, format, va);
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	49 va_end(va);
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	50 return rc;
18908 79c676f9b34a This patch turns the Python API mismatch notice into a standard Marc-André Lemburg <mal@egenix.com> parents: diff changeset	51 }
79c676f9b34a This patch turns the Python API mismatch notice into a standard Marc-André Lemburg <mal@egenix.com> parents: diff changeset	52
21145 87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	53 int
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	54 PyOS_vsnprintf(char str, size_t size, const char format, va_list va)
18908 79c676f9b34a This patch turns the Python API mismatch notice into a standard Marc-André Lemburg <mal@egenix.com> parents: diff changeset	55 {
21145 87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	56 int len; /* # bytes written, excluding \0 */
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	57 #ifndef HAVE_SNPRINTF
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	58 char *buffer;
18908 79c676f9b34a This patch turns the Python API mismatch notice into a standard Marc-André Lemburg <mal@egenix.com> parents: diff changeset	59 #endif
21145 87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	60 assert(str != NULL);
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	61 assert(size > 0);
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	62 assert(format != NULL);
18908 79c676f9b34a This patch turns the Python API mismatch notice into a standard Marc-André Lemburg <mal@egenix.com> parents: diff changeset	63
21145 87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	64 #ifdef HAVE_SNPRINTF
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	65 len = vsnprintf(str, size, format, va);
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	66 #else
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	67 /* Emulate it. */
21518 8af86a952b2c PyOS_vsnprintf(): Change PyMem_Malloc() call to PyMem_MALLOC() macro, Barry Warsaw <barry@python.org> parents: 21145 diff changeset	68 buffer = PyMem_MALLOC(size + 512);
21145 87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	69 if (buffer == NULL) {
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	70 len = -666;
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	71 goto Done;
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	72 }
18908 79c676f9b34a This patch turns the Python API mismatch notice into a standard Marc-André Lemburg <mal@egenix.com> parents: diff changeset	73
21145 87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	74 len = vsprintf(buffer, format, va);
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	75 if (len < 0)
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	76 /* ignore the error */;
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	77
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	78 else if ((size_t)len >= size + 512)
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	79 Py_FatalError("Buffer overflow in PyOS_snprintf/PyOS_vsnprintf");
18908 79c676f9b34a This patch turns the Python API mismatch notice into a standard Marc-André Lemburg <mal@egenix.com> parents: diff changeset	80
21145 87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	81 else {
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	82 const size_t to_copy = (size_t)len < size ?
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	83 (size_t)len : size - 1;
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	84 assert(to_copy < size);
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	85 memcpy(str, buffer, to_copy);
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	86 str[to_copy] = '\0';
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	87 }
21518 8af86a952b2c PyOS_vsnprintf(): Change PyMem_Malloc() call to PyMem_MALLOC() macro, Barry Warsaw <barry@python.org> parents: 21145 diff changeset	88 PyMem_FREE(buffer);
21145 87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	89 Done:
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	90 #endif
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	91 str[size-1] = '\0';
87fa6e9bd77e mysnprintf.c: Massive rewrite of PyOS_snprintf and PyOS_vsnprintf, to Tim Peters <tim.peters@gmail.com> parents: 21126 diff changeset	92 return len;
18908 79c676f9b34a This patch turns the Python API mismatch notice into a standard Marc-André Lemburg <mal@egenix.com> parents: diff changeset	93 }

Mercurial > cpython-lru_cache-weakref

annotate Python/mysnprintf.c @ 42775:d7517c306791