This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8276

cext-index: propagate inline_scan error in `index_deref`
ClosedPublic

Authored by marmoute on Mar 12 2020, 2:26 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG864e9534d3d4: cext-index: propagate inline_scan error in `index_deref`
Summary

Before this change, revlog index corruption could be silently ignored in some
situation.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Mar 12 2020, 2:26 PM
Alphare accepted this revision.Mar 13 2020, 11:48 AM
marmoute added a commit: rHG864e9534d3d4: cext-index: propagate inline_scan error in `index_deref`.Mar 16 2020, 11:04 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG864e9534d3d4: cext-index: propagate inline_scan error in `index_deref` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 20760

mercurial/cext/revlog.c

static const char *index_deref(indexObject *self, Py_ssize_t pos) static const char *index_deref(indexObject *self, Py_ssize_t pos)
{ {
if (self->inlined && pos > 0) { if (self->inlined && pos > 0) {
if (self->offsets == NULL) { if (self->offsets == NULL) {
self->offsets = PyMem_Malloc(self->raw_length * self->offsets = PyMem_Malloc(self->raw_length *
sizeof(*self->offsets)); sizeof(*self->offsets));
if (self->offsets == NULL) if (self->offsets == NULL)
return (const char *)PyErr_NoMemory(); return (const char *)PyErr_NoMemory();
inline_scan(self, self->offsets); Py_ssize_t ret = inline_scan(self, self->offsets);
if (ret == -1) {
return NULL;
};
} }
return self->offsets[pos]; return self->offsets[pos];
} }
return (const char *)(self->buf.buf) + pos * v1_hdrsize; return (const char *)(self->buf.buf) + pos * v1_hdrsize;
} }
/* /*