This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4164

index: move check for too large capacity into nt_init()
ClosedPublic

Authored by martinvonz on Aug 9 2018, 3:27 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4dd92a15fcca: index: move check for too large capacity into nt_init()
Summary

It's clearer to have the check just before the allocation happens.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Aug 9 2018, 3:27 AM
Closed by commit rHG4dd92a15fcca: index: move check for too large capacity into nt_init() (authored by martinvonz). · Explain WhyAug 12 2018, 12:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/revlog.c (8 lines)

Diff 10337

mercurial/cext/revlog.c

} }
static int nt_init(nodetree *self, indexObject *index, unsigned capacity) static int nt_init(nodetree *self, indexObject *index, unsigned capacity)
{ {
self->index = index; self->index = index;
self->capacity = capacity; self->capacity = capacity;
self->depth = 0; self->depth = 0;
self->splits = 0; self->splits = 0;
if ((size_t)self->capacity > INT_MAX / sizeof(nodetreenode)) {
PyErr_SetString(PyExc_ValueError, "overflow in init_nt");
return -1;
}
self->nodes = calloc(self->capacity, sizeof(nodetreenode)); self->nodes = calloc(self->capacity, sizeof(nodetreenode));
if (self->nodes == NULL) { if (self->nodes == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
return -1; return -1;
} }
self->length = 1; self->length = 1;
return 0; return 0;
} }
*/ */
PyErr_SetString(PyExc_Exception, "broken node tree"); PyErr_SetString(PyExc_Exception, "broken node tree");
return -3; return -3;
} }
static int index_init_nt(indexObject *self) static int index_init_nt(indexObject *self)
{ {
if (self->nt == NULL) { if (self->nt == NULL) {
if ((size_t)self->raw_length > INT_MAX / sizeof(nodetreenode)) {
PyErr_SetString(PyExc_ValueError, "overflow in index_init_nt");
return -1;
}
self->nt = PyMem_Malloc(sizeof(nodetree)); self->nt = PyMem_Malloc(sizeof(nodetree));
if (self->nt == NULL) { if (self->nt == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
return -1; return -1;
} }
unsigned capacity = (self->raw_length < 4 ? 4 : (int)self->raw_length / 2); unsigned capacity = (self->raw_length < 4 ? 4 : (int)self->raw_length / 2);
if (nt_init(self->nt, self, capacity) == -1) { if (nt_init(self->nt, self, capacity) == -1) {
PyMem_Free(self->nt); PyMem_Free(self->nt);