This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4297

util: improve handling of truncated compressed streams
ClosedPublic

Authored by joerg.sonnenberger on Aug 16 2018, 4:30 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1af95139e5ec: util: improve handling of truncated compressed streams
Summary

If the compressed stream is over as marked by the reader providing
nothing new and the compression engine is not providing data, bail out.
This can happen in practise when the server misbehaves and would result
in an infinite loop otherwise.

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

Closed by commit rHG1af95139e5ec: util: improve handling of truncated compressed streams (authored by joerg.sonnenberger). · Explain WhyAug 20 2018, 3:21 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (3 lines)

Diff 10470

mercurial/util.py

buf.append(newbuf) buf.append(newbuf)
l -= len(newbuf) l -= len(newbuf)
self._pos = 0 self._pos = 0
if self._eof: if self._eof:
return ''.join(buf) return ''.join(buf)
chunk = self._reader(65536) chunk = self._reader(65536)
self._decompress(chunk) self._decompress(chunk)
if not chunk and not self._pending and not self._eof:
# No progress and no new data, bail out
return ''.join(buf)
class _GzipCompressedStreamReader(_CompressedStreamReader): class _GzipCompressedStreamReader(_CompressedStreamReader):
def __init__(self, fh): def __init__(self, fh):
super(_GzipCompressedStreamReader, self).__init__(fh) super(_GzipCompressedStreamReader, self).__init__(fh)
self._decompobj = zlib.decompressobj() self._decompobj = zlib.decompressobj()
def _decompress(self, chunk): def _decompress(self, chunk):
newbuf = self._decompobj.decompress(chunk) newbuf = self._decompobj.decompress(chunk)
if newbuf: if newbuf: