Mercurial > hg
changeset 40600:f27f8e9ef1e7
manifest: also reject obviously-too-short lines when parsing lines
Differential Revision: https://phab.mercurial-scm.org/D5257
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 12 Nov 2018 20:31:57 -0500 |
| parents | 9eeda7199181 |
| children | da4478ca0e32 |
| files | mercurial/cext/manifest.c |
| diffstat | 1 files changed, 15 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cext/manifest.c Mon Nov 12 20:35:22 2018 -0500 +++ b/mercurial/cext/manifest.c Mon Nov 12 20:31:57 2018 -0500 @@ -39,6 +39,7 @@ #define MANIFEST_NOT_SORTED -2 #define MANIFEST_MALFORMED -3 #define MANIFEST_BOGUS_FILENAME -4 +#define MANIFEST_TOO_SHORT_LINE -5 /* get the length of the path for a line */ static size_t pathlen(line *l) @@ -126,6 +127,15 @@ if (!next) { return MANIFEST_MALFORMED; } + if ((next - data) < 22) { + /* We should have at least 22 bytes in a line: + 1 byte filename + 1 NUL + 20 bytes of hash + so we can give up here. + */ + return MANIFEST_TOO_SHORT_LINE; + } next++; /* advance past newline */ if (!realloc_if_full(self)) { return MANIFEST_OOM; /* no memory */ @@ -202,6 +212,11 @@ PyExc_ValueError, "Manifest had an entry with a zero-length filename."); break; + case MANIFEST_TOO_SHORT_LINE: + PyErr_Format( + PyExc_ValueError, + "Manifest had implausibly-short line."); + break; default: PyErr_Format(PyExc_ValueError, "Unknown problem parsing manifest.");