traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 76740 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76740 | mark.dickinson | 2009-12-10 10:36:32 +0000 (Thu, 10 Dec 2009) | 8 lines

  Replace the size check for PyMem_MALLOC and PyMem_REALLOC with an almost
  equivalent[*] check that doesn't produce compiler warnings about a 'x < 0'
  check on an unsigned type.

  [*] it's equivalent for inputs of type size_t or Py_ssize_t, or any smaller
  unsigned or signed integer type.
........
This commit is contained in:
Mark Dickinson 2009-12-10 10:39:08 +00:00
parent 3f9afd816d
commit 629dfe28f5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Include/pymem.h
View File

@ -71,9 +71,9 @@ PyAPI_FUNC(void) PyMem_Free(void *);
pymalloc. To solve these problems, allocate an extra byte. */
/* Returns NULL to indicate error if a negative size or size larger than
Py_ssize_t can represent is supplied. Helps prevents security holes. */
#define PyMem_MALLOC(n) (((n) < 0 || (n) > PY_SSIZE_T_MAX) ? NULL \
#define PyMem_MALLOC(n) ((size_t)(n) > (size_t)PY_SSIZE_T_MAX ? NULL \
: malloc((n) ? (n) : 1))
#define PyMem_REALLOC(p, n) (((n) < 0 || (n) > PY_SSIZE_T_MAX) ? NULL \
#define PyMem_REALLOC(p, n) ((size_t)(n) > (size_t)PY_SSIZE_T_MAX ? NULL \
: realloc((p), (n) ? (n) : 1))
#define PyMem_FREE free