This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5347

manifest: reject lines shorter than 42 bytes, not 22
ClosedPublic

Authored by durin42 on Nov 29 2018, 4:44 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7e6834ade51d: manifest: reject lines shorter than 42 bytes, not 22
Summary

Yuya correctly spotted during the review of f27f8e9ef1e73 that we're
dealing with hexlified hashes here, and so it should be 42 bytes not
22.

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 29 2018, 4:44 PM
Closed by commit rHG7e6834ade51d: manifest: reject lines shorter than 42 bytes, not 22 (authored by durin42). · Explain WhyNov 30 2018, 7:07 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 12662

mercurial/cext/manifest.c

/* 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) { if ((next - data) < 42) {
/* We should have at least 22 bytes in a line: /* We should have at least 42 bytes in a line:
1 byte filename 1 byte filename
1 NUL 1 NUL
20 bytes of hash 40 bytes of hash
so we can give up here. so we can give up here.
*/ */
return MANIFEST_TOO_SHORT_LINE; return MANIFEST_TOO_SHORT_LINE;
} }
next++; /* advance past newline */ next++; /* advance past newline */
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;