summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Ressi <fressi@redhat.com>2019-09-27 12:44:13 +0200
committerFederico Ressi <fressi@redhat.com>2019-09-27 12:44:13 +0200
commit44af2b1eebd438178681fd3a1af38d9def2f93e9 (patch)
tree31b97e578ff88bbb307f2451c77712cd5ebb3794
parent58c3d364266e7550d3e00e34191eed7df2d36d13 (diff)
downloadsubunit-git-44af2b1eebd438178681fd3a1af38d9def2f93e9.tar.gz
Check written bytes are not None before summing them to offset
Because purely written streams could return None instead of written bytes, we cannot sum them to offset integer. On such case let assume data has been written all at once. This fixes LaunchPad [#1845631](https://bugs.launchpad.net/subunit/+bug/1845631)
-rw-r--r--python/subunit/v2.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/python/subunit/v2.py b/python/subunit/v2.py
index 254617c..7f4842e 100644
--- a/python/subunit/v2.py
+++ b/python/subunit/v2.py
@@ -223,6 +223,8 @@ class StreamResultToBytes(object):
offset = 0
while offset < datalen:
written = self.output_stream.write(view[offset:])
+ if written is None:
+ break
offset += written
else:
self.output_stream.write(data)