This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8370

manifest: fix another pure-parsing 20-byte assumption
ClosedPublic

Authored by durin42 on Apr 2 2020, 4:32 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0415a566742a: manifest: fix another pure-parsing 20-byte assumption

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.Apr 2 2020, 4:32 PM
Alphare accepted this revision.Apr 14 2020, 4:51 AM
Alphare added a subscriber: Alphare.

Same here (and for every other point in the stack, I won't spam comments).

durin42 updated this revision to Diff 21052.Apr 14 2020, 11:29 AM
pulkit accepted this revision.Apr 14 2020, 2:57 PM
This revision is now accepted and ready to land.Apr 14 2020, 2:57 PM
durin42 added a commit: rHG0415a566742a: manifest: fix another pure-parsing 20-byte assumption.Apr 14 2020, 3:18 PM
Closed by commit rHG0415a566742a: manifest: fix another pure-parsing 20-byte assumption (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/manifest.py (9 lines)

Diff 21083

mercurial/manifest.py

offset += end_cut - cur offset += end_cut - cur
l.append(self.data[last_cut:end_cut]) l.append(self.data[last_cut:end_cut])
else: else:
while i < len(self.positions) and self.positions[i] < 0: while i < len(self.positions) and self.positions[i] < 0:
cur = self.positions[i] cur = self.positions[i]
t = self.extradata[-cur - 1] t = self.extradata[-cur - 1]
l.append(self._pack(t)) l.append(self._pack(t))
self.positions[i] = offset self.positions[i] = offset
if len(t[1]) > 20: # Hashes are either 20 bytes (old sha1s) or 32
self.extrainfo[i] = ord(t[1][21]) # bytes (new non-sha1).
hlen = 20
if len(t[1]) > 25:
hlen = 32
if len(t[1]) > hlen:
self.extrainfo[i] = ord(t[1][hlen + 1])
offset += len(l[-1]) offset += len(l[-1])
i += 1 i += 1
self.data = b''.join(l) self.data = b''.join(l)
self.hasremovals = False self.hasremovals = False
self.extradata = [] self.extradata = []
def _pack(self, d): def _pack(self, d):
n = d[1] n = d[1]