This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4152

index: use PyMem_Free() to free nodeetree instance
ClosedPublic

Authored by martinvonz on Aug 7 2018, 2:26 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG05c1f5f49ebb: index: use PyMem_Free() to free nodeetree instance
Summary

As Yuya pointed out in the review of D4108, PyMem_Malloc() and
PyMem_Free() should be paired. IIUC, PyMem_Malloc() may use a
different allocator than malloc(), so using free() with a pointer from
PyMem_Malloc() may be very wrong.

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 7 2018, 2:26 AM
Closed by commit rHG05c1f5f49ebb: index: use PyMem_Free() to free nodeetree instance (authored by martinvonz). · Explain WhyAug 7 2018, 8:52 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 10047

mercurial/cext/revlog.c

self->cache = NULL; self->cache = NULL;
} }
if (self->offsets) { if (self->offsets) {
PyMem_Free(self->offsets); PyMem_Free(self->offsets);
self->offsets = NULL; self->offsets = NULL;
} }
if (self->nt != NULL) { if (self->nt != NULL) {
free(self->nt->nodes); free(self->nt->nodes);
free(self->nt); PyMem_Free(self->nt);
} }
self->nt = NULL; self->nt = NULL;
Py_CLEAR(self->headrevs); Py_CLEAR(self->headrevs);
} }
static PyObject *index_clearcaches(indexObject *self) static PyObject *index_clearcaches(indexObject *self)
{ {
_index_clearcaches(self); _index_clearcaches(self);
PyErr_SetString(PyExc_ValueError, "overflow in nt_init"); PyErr_SetString(PyExc_ValueError, "overflow in nt_init");
return -1; return -1;
} }
self->nt->capacity = self->raw_length < 4 self->nt->capacity = self->raw_length < 4
? 4 : (int)self->raw_length / 2; ? 4 : (int)self->raw_length / 2;
self->nt->nodes = calloc(self->nt->capacity, sizeof(nodetreenode)); self->nt->nodes = calloc(self->nt->capacity, sizeof(nodetreenode));
if (self->nt->nodes == NULL) { if (self->nt->nodes == NULL) {
free(self->nt); PyMem_Free(self->nt);
self->nt = NULL; self->nt = NULL;
PyErr_NoMemory(); PyErr_NoMemory();
return -1; return -1;
} }
self->ntrev = (int)index_length(self); self->ntrev = (int)index_length(self);
self->ntlookups = 1; self->ntlookups = 1;
self->ntmisses = 0; self->ntmisses = 0;
self->nt->depth = 0; self->nt->depth = 0;
self->nt->splits = 0; self->nt->splits = 0;
self->nt->length = 1; self->nt->length = 1;
if (nt_insert(self, nullid, -1) == -1) { if (nt_insert(self, nullid, -1) == -1) {
free(self->nt->nodes); free(self->nt->nodes);
free(self->nt); PyMem_Free(self->nt);
self->nt = NULL; self->nt = NULL;
return -1; return -1;
} }
} }
return 0; return 0;
} }
/* /*