FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-39943: Use calloc-based functions, not malloc+memset by petdance · Pull Request #19152 · python/cpython · GitHub

Repository navigation

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .c  (9) .h  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
6 changes: 2 additions & 4 deletions Modules/_ctypes/callproc.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,9 @@ _ctypes_get_errobj(int **pspace)
Py_INCREF(errobj);
}
else if (!PyErr_Occurred()) {
void *space = PyMem_Malloc(sizeof(int) * 2);
void *space = PyMem_Calloc(2, sizeof(int));
if (space == NULL)
return NULL;
memset(space, 0, sizeof(int) * 2);
errobj = PyCapsule_New(space, CTYPES_CAPSULE_NAME_PYMEM, pymem_destructor);
if (errobj == NULL) {
PyMem_Free(space);
Expand Down Expand Up @@ -1712,10 +1711,9 @@ resize(PyObject *self, PyObject *args)
if (!_CDataObject_HasExternalBuffer(obj)) {
/* We are currently using the objects default buffer, but it
isn't large enough any more. */
void *ptr = PyMem_Malloc(size);
void *ptr = PyMem_Calloc(1, size);
if (ptr == NULL)
return PyErr_NoMemory();
memset(ptr, 0, size);
memmove(ptr, obj->b_ptr, obj->b_size);
obj->b_ptr = ptr;
obj->b_size = size;
Expand Down
9 changes: 3 additions & 6 deletions Modules/_lzmamodule.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,9 @@ parse_filter_spec_lzma(PyObject *spec)
return NULL;
}

options = (lzma_options_lzma *)PyMem_Malloc(sizeof *options);
options = (lzma_options_lzma *)PyMem_Calloc(1, sizeof *options);
if (options == NULL)
return PyErr_NoMemory();
memset(options, 0, sizeof *options);

if (lzma_lzma_preset(options, preset)) {
PyMem_Free(options);
Expand Down Expand Up @@ -257,10 +256,9 @@ parse_filter_spec_delta(PyObject *spec)
return NULL;
}

options = (lzma_options_delta *)PyMem_Malloc(sizeof *options);
options = (lzma_options_delta *)PyMem_Calloc(1, sizeof *options);
if (options == NULL)
return PyErr_NoMemory();
memset(options, 0, sizeof *options);
options->type = LZMA_DELTA_TYPE_BYTE;
options->dist = dist;
return options;
Expand All @@ -281,10 +279,9 @@ parse_filter_spec_bcj(PyObject *spec)
return NULL;
}

options = (lzma_options_bcj *)PyMem_Malloc(sizeof *options);
options = (lzma_options_bcj *)PyMem_Calloc(1, sizeof *options);
if (options == NULL)
return PyErr_NoMemory();
memset(options, 0, sizeof *options);
options->start_offset = start_offset;
return options;
}
Expand Down
3 changes: 1 addition & 2 deletions Modules/_winapi.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -603,11 +603,10 @@ _winapi_CreateJunction_impl(PyObject *module, LPWSTR src_path,
sizeof(rdb->MountPointReparseBuffer.PathBuffer) +
/* Two +1's for NUL terminators. */
(prefix_len + print_len + 1 + print_len + 1) * sizeof(WCHAR);
rdb = (_Py_PREPARSE_DATA_BUFFER)PyMem_RawMalloc(rdb_size);
rdb = (_Py_PREPARSE_DATA_BUFFER)PyMem_RawCalloc(1, rdb_size);
if (rdb == NULL)
goto cleanup;

memset(rdb, 0, rdb_size);
rdb->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT;
rdb->ReparseDataLength = rdb_size - _Py_REPARSE_DATA_BUFFER_HEADER_SIZE;
rdb->MountPointReparseBuffer.SubstituteNameOffset = 0;
Expand Down
10 changes: 2 additions & 8 deletions Modules/binascii.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -1311,15 +1311,12 @@ binascii_a2b_qp_impl(PyObject *module, Py_buffer *data, int header)
datalen = data->len;

/* We allocate the output same size as input, this is overkill.
* The previous implementation used calloc() so we'll zero out the
* memory here too, since PyMem_Malloc() does not guarantee that.
*/
odata = (unsigned char *) PyMem_Malloc(datalen);
odata = (unsigned char *) PyMem_Calloc(1, datalen);
if (odata == NULL) {
PyErr_NoMemory();
return NULL;
}
memset(odata, 0, datalen);

in = out = 0;
while (in < datalen) {
Expand Down Expand Up @@ -1499,15 +1496,12 @@ binascii_b2a_qp_impl(PyObject *module, Py_buffer *data, int quotetabs,
}

/* We allocate the output same size as input, this is overkill.
* The previous implementation used calloc() so we'll zero out the
* memory here too, since PyMem_Malloc() does not guarantee that.
*/
odata = (unsigned char *) PyMem_Malloc(odatalen);
odata = (unsigned char *) PyMem_Calloc(1, odatalen);
if (odata == NULL) {
PyErr_NoMemory();
return NULL;
}
memset(odata, 0, odatalen);

in = out = linelen = 0;
while (in < datalen) {
Expand Down
3 changes: 1 addition & 2 deletions Modules/faulthandler.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -911,10 +911,9 @@ faulthandler_register_py(PyObject *self,
return NULL;

if (user_signals == NULL) {
user_signals = PyMem_Malloc(NSIG * sizeof(user_signal_t));
user_signals = PyMem_Calloc(NSIG, sizeof(user_signal_t));
if (user_signals == NULL)
return PyErr_NoMemory();
memset(user_signals, 0, NSIG * sizeof(user_signal_t));
}
user = &user_signals[signum];

Expand Down
3 changes: 1 addition & 2 deletions PC/_testconsole.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,9 @@ _testconsole_write_input_impl(PyObject *module, PyObject *file,
const wchar_t *p = (const wchar_t *)PyBytes_AS_STRING(s);
DWORD size = (DWORD)PyBytes_GET_SIZE(s) / sizeof(wchar_t);

rec = (INPUT_RECORD*)PyMem_Malloc(sizeof(INPUT_RECORD) * size);
rec = (INPUT_RECORD*)PyMem_Calloc(size, sizeof(INPUT_RECORD));
if (!rec)
goto error;
memset(rec, 0, sizeof(INPUT_RECORD) * size);

INPUT_RECORD *prec = rec;
for (DWORD i = 0; i < size; ++i, ++p, ++prec) {
Expand Down
3 changes: 1 addition & 2 deletions PC/getpathp.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -370,11 +370,10 @@ getpythonregpath(HKEY keyBase, int skipcore)
/* Allocate a temp array of char buffers, so we only need to loop
reading the registry once
*/
ppPaths = PyMem_RawMalloc( sizeof(WCHAR *) * numKeys );
ppPaths = PyMem_RawCalloc(numKeys, sizeof(WCHAR *));
if (ppPaths==NULL) {
goto done;
}
memset(ppPaths, 0, sizeof(WCHAR *) * numKeys);
/* Loop over all subkeys, allocating a temp sub-buffer. */
for(index=0;index<numKeys;index++) {
WCHAR keyBuf[MAX_PATH+1];
Expand Down
12 changes: 4 additions & 8 deletions Python/compile.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -561,13 +561,12 @@ compiler_enter_scope(struct compiler *c, identifier name,
struct compiler_unit *u;
basicblock *block;

u = (struct compiler_unit *)PyObject_Malloc(sizeof(
u = (struct compiler_unit *)PyObject_Calloc(1, sizeof(
struct compiler_unit));
if (!u) {
PyErr_NoMemory();
return 0;
}
memset(u, 0, sizeof(struct compiler_unit));
u->u_scope_type = scope_type;
u->u_argcount = 0;
u->u_posonlyargcount = 0;
Expand Down Expand Up @@ -770,12 +769,11 @@ compiler_new_block(struct compiler *c)
struct compiler_unit *u;

u = c->u;
b = (basicblock *)PyObject_Malloc(sizeof(basicblock));
b = (basicblock *)PyObject_Calloc(1, sizeof(basicblock));
if (b == NULL) {
PyErr_NoMemory();
return NULL;
}
memset((void *)b, 0, sizeof(basicblock));
/* Extend the singly linked list of blocks with new block. */
b->b_list = u->u_blocks;
u->u_blocks = b;
Expand Down Expand Up @@ -812,15 +810,13 @@ compiler_next_instr(basicblock *b)
{
assert(b != NULL);
if (b->b_instr == NULL) {
b->b_instr = (struct instr *)PyObject_Malloc(
sizeof(struct instr) * DEFAULT_BLOCK_SIZE);
b->b_instr = (struct instr *)PyObject_Calloc(
DEFAULT_BLOCK_SIZE, sizeof(struct instr));
if (b->b_instr == NULL) {
PyErr_NoMemory();
return -1;
}
b->b_ialloc = DEFAULT_BLOCK_SIZE;
memset((char *)b->b_instr, 0,
sizeof(struct instr) * DEFAULT_BLOCK_SIZE);
}
else if (b->b_iused == b->b_ialloc) {
struct instr *tmp;
Expand Down
3 changes: 1 addition & 2 deletions Python/pystate.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -206,12 +206,11 @@ PyInterpreterState_New(void)
return NULL;
}

PyInterpreterState *interp = PyMem_RawMalloc(sizeof(PyInterpreterState));
PyInterpreterState *interp = PyMem_RawCalloc(1, sizeof(PyInterpreterState));
if (interp == NULL) {
return NULL;
}

memset(interp, 0, sizeof(*interp));
interp->id_refcount = -1;

_PyRuntimeState *runtime = &_PyRuntime;
Expand Down
3 changes: 1 addition & 2 deletions Python/thread_pthread.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -547,9 +547,8 @@ PyThread_allocate_lock(void)
if (!initialized)
PyThread_init_thread();

lock = (pthread_lock *) PyMem_RawMalloc(sizeof(pthread_lock));
lock = (pthread_lock *) PyMem_RawCalloc(1, sizeof(pthread_lock));
if (lock) {
memset((void *)lock, '\0', sizeof(pthread_lock));
lock->locked = 0;

status = pthread_mutex_init(&lock->mut, NULL);
Expand Down

Back | FazBrowse Home | New Git URL