Changeset 391 for python/trunk/Include/pymem.h

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Include/pymem.h (modified) (2 diffs)

python/trunk/Include/pymem.h

@@ -60 +60 @@
 #ifdef PYMALLOC_DEBUG
 /* Redirect all memory operations to Python's debugging allocator. */
-#define PyMem_MALLOC            PyObject_MALLOC
-#define PyMem_REALLOC           PyObject_REALLOC
-#define PyMem_FREE              PyObject_FREE
+#define PyMem_MALLOC            _PyMem_DebugMalloc
+#define PyMem_REALLOC           _PyMem_DebugRealloc
+#define PyMem_FREE              _PyMem_DebugFree
 
 #else   /* ! PYMALLOC_DEBUG */
@@ -72 +72 @@
 /* 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