Mercurial > hg
changeset 38821:d814bbd22946
revlog: remove side effect from failed nt_init()
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.
Differential Revision: https://phab.mercurial-scm.org/D4028
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 17 Jul 2018 23:34:55 -0700 |
| parents | 44bbc89ec5e0 |
| children | f8732e33bcbc |
| files | mercurial/cext/revlog.c |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cext/revlog.c Sun Jul 08 23:39:32 2018 -0700 +++ b/mercurial/cext/revlog.c Tue Jul 17 23:34:55 2018 -0700 @@ -1112,8 +1112,11 @@ self->ntrev = (int)index_length(self) - 1; self->ntlookups = 1; 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 0; }