This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5257

manifest: also reject obviously-too-short lines when parsing lines
ClosedPublic

Authored by durin42 on Nov 12 2018, 8:52 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf27f8e9ef1e7: manifest: also reject obviously-too-short lines when parsing lines
Summary

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

durin42 created this revision.Nov 12 2018, 8:52 PM
yuja added a subscriber: yuja.Nov 13 2018, 6:38 AM

+ if ((next - data) < 22) {
+ /* We should have at least 22 bytes in a line:
+ 1 byte filename
+ 1 NUL
+ 20 bytes of hash

Queued, but I think it should be 40 bytes of hexadecimal hash.

Closed by commit rHGf27f8e9ef1e7: manifest: also reject obviously-too-short lines when parsing lines (authored by durin42). · Explain WhyNov 13 2018, 6:42 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/manifest.c (15 lines)

Diff 12511

mercurial/cext/manifest.c

int maxlines; /* allocated number of lines */ int maxlines; /* allocated number of lines */
bool dirty; bool dirty;
} lazymanifest; } lazymanifest;
#define MANIFEST_OOM -1 #define MANIFEST_OOM -1
#define MANIFEST_NOT_SORTED -2 #define MANIFEST_NOT_SORTED -2
#define MANIFEST_MALFORMED -3 #define MANIFEST_MALFORMED -3
#define MANIFEST_BOGUS_FILENAME -4 #define MANIFEST_BOGUS_FILENAME -4
#define MANIFEST_TOO_SHORT_LINE -5
/* get the length of the path for a line */ /* get the length of the path for a line */
static size_t pathlen(line *l) static size_t pathlen(line *l)
{ {
const char *end = memchr(l->start, '\0', l->len); const char *end = memchr(l->start, '\0', l->len);
return (end) ? (size_t)(end - l->start) : l->len; return (end) ? (size_t)(end - l->start) : l->len;
} }
/* It's implausible there's no filename, don't /* It's implausible there's no filename, don't
* even bother looking for the newline. */ * even bother looking for the newline. */
return MANIFEST_BOGUS_FILENAME; return MANIFEST_BOGUS_FILENAME;
} }
next = memchr(data, '\n', len); next = memchr(data, '\n', len);
if (!next) { if (!next) {
return MANIFEST_MALFORMED; 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 */ next++; /* advance past newline */
if (!realloc_if_full(self)) { if (!realloc_if_full(self)) {
return MANIFEST_OOM; /* no memory */ return MANIFEST_OOM; /* no memory */
} }
if (prev && strcmp(prev, data) > -1) { if (prev && strcmp(prev, data) > -1) {
/* This data isn't sorted, so we have to abort. */ /* This data isn't sorted, so we have to abort. */
return MANIFEST_NOT_SORTED; return MANIFEST_NOT_SORTED;
} }
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"Manifest did not end in a newline."); "Manifest did not end in a newline.");
break; break;
case MANIFEST_BOGUS_FILENAME: case MANIFEST_BOGUS_FILENAME:
PyErr_Format( PyErr_Format(
PyExc_ValueError, PyExc_ValueError,
"Manifest had an entry with a zero-length filename."); "Manifest had an entry with a zero-length filename.");
break; break;
case MANIFEST_TOO_SHORT_LINE:
PyErr_Format(
PyExc_ValueError,
"Manifest had implausibly-short line.");
break;
default: default:
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"Unknown problem parsing manifest."); "Unknown problem parsing manifest.");
} }
return ret == 0 ? 0 : -1; return ret == 0 ? 0 : -1;
} }
static void lazymanifest_dealloc(lazymanifest *self) static void lazymanifest_dealloc(lazymanifest *self)