This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4028

revlog: remove side effect from failed nt_init()
ClosedPublic

Authored by martinvonz on Aug 1 2018, 3:01 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd814bbd22946: revlog: remove side effect from failed nt_init()
Summary

If nt_init() successfully allocates memory for the node tree but then
runs out of memory while trying to insert nullid into it, it will
leave the node tree pointer set on the index object. That means that
future node tree operations will think that the tree is properly
initialized. It seems very unlikely to make a difference in practice
(if nt_init() runs out of memory, not much else will probably work),
but since I spotted it, I figured I might as well fix it.

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 1 2018, 3:01 PM
Closed by commit rHGd814bbd22946: revlog: remove side effect from failed nt_init() (authored by martinvonz). · Explain WhyAug 3 2018, 9:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 9822

mercurial/cext/revlog.c

if (self->nt == NULL) { if (self->nt == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
return -1; return -1;
} }
self->ntlength = 1; self->ntlength = 1;
self->ntrev = (int)index_length(self) - 1; self->ntrev = (int)index_length(self) - 1;
self->ntlookups = 1; self->ntlookups = 1;
self->ntmisses = 0; self->ntmisses = 0;
if (nt_insert(self, nullid, INT_MAX) == -1) if (nt_insert(self, nullid, INT_MAX) == -1) {
free(self->nt);
self->nt = NULL;
return -1; return -1;
} }
}
return 0; return 0;
} }
/* /*
* Return values: * Return values:
* *
* -3: error (exception set) * -3: error (exception set)
* -2: not found (no exception set) * -2: not found (no exception set)