From f9ba0d8cbcec27f81ea87aa2cff4070a6b0d830e Mon Sep 17 00:00:00 2001 From: Felipe Fumero Date: Thu, 19 Nov 2026 12:53:52 -0600 Subject: [PATCH 1/3] fix: bound negative range stream reads --- b2sdk/_internal/stream/range.py | 2 +- test/unit/stream/test_finding_c46_range.py | 34 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 test/unit/stream/test_finding_c46_range.py diff --git a/b2sdk/_internal/stream/range.py b/b2sdk/_internal/stream/range.py index cdc891ed8..e7b2f62e1 100644 --- a/b2sdk/_internal/stream/range.py +++ b/b2sdk/_internal/stream/range.py @@ -63,7 +63,7 @@ def read(self, size=None): :rtype: bytes """ remaining = max(0, self.length - self.relative_pos) - if size is None: + if size is None or size < 0: to_read = remaining else: to_read = min(size, remaining) diff --git a/test/unit/stream/test_finding_c46_range.py b/test/unit/stream/test_finding_c46_range.py new file mode 100644 index 000000000..a93880023 --- /dev/null +++ b/test/unit/stream/test_finding_c46_range.py @@ -0,0 +1,34 @@ +###################################################################### +# +# File: test/unit/stream/test_finding_c46_range.py +# +# Copyright 2026 Backblaze Inc. All Rights Reserved. +# +# License https://www.backblaze.com/using_b2_code.html +# +###################################################################### +import io + +import pytest + +from b2sdk._internal.stream.range import RangeOfInputStream + + +def test_c46_read_minus_one_does_not_go_past_range_end(): + with RangeOfInputStream(io.BytesIO(b'0123456789'), offset=2, length=3) as stream: + assert stream.read(-1) == b'234' + + +@pytest.mark.parametrize('size', [-1, -7]) +def test_negative_read_is_bounded_after_partial_read(size): + with RangeOfInputStream(io.BytesIO(b'0123456789'), offset=2, length=3) as stream: + assert stream.read(1) == b'2' + assert stream.read(size) == b'34' + assert stream.tell() == 3 + assert stream.read(size) == b'' + + +def test_negative_read_from_empty_range_is_empty(): + with RangeOfInputStream(io.BytesIO(b'0123456789'), offset=2, length=0) as stream: + assert stream.read(-1) == b'' + assert stream.tell() == 0 From 97963ac0304edb1a80531fefb8abfb1874158c86 Mon Sep 17 00:00:00 2001 From: Felipe Fumero Date: Thu, 19 Nov 2026 12:55:58 -0600 Subject: [PATCH 2/3] docs: clarify bounded stream reads --- b2sdk/_internal/stream/range.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2sdk/_internal/stream/range.py b/b2sdk/_internal/stream/range.py index e7b2f62e1..cb96f5a0d 100644 --- a/b2sdk/_internal/stream/range.py +++ b/b2sdk/_internal/stream/range.py @@ -58,7 +58,7 @@ def read(self, size=None): """ Read data from the stream. - :param int size: number of bytes to read + :param int size: number of bytes to read; None or a negative value reads the remaining range :return: data read from the stream :rtype: bytes """ From df4f9c8b51b65ae1e9b84cfce384a64048b7a228 Mon Sep 17 00:00:00 2001 From: Felipe Fumero Date: Thu, 19 Nov 2026 13:05:18 -0600 Subject: [PATCH 3/3] docs: add range stream changelog entry --- changelog.d/+range-read-negative-size.fixed.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/+range-read-negative-size.fixed.md diff --git a/changelog.d/+range-read-negative-size.fixed.md b/changelog.d/+range-read-negative-size.fixed.md new file mode 100644 index 000000000..daf785358 --- /dev/null +++ b/changelog.d/+range-read-negative-size.fixed.md @@ -0,0 +1 @@ +Reading a range stream with a negative size no longer returns bytes past the end of the configured range.