Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpo-42924: Fix incorrect copy in bytearray_repeat #24208

Merged
merged 3 commits into from Jan 13, 2021
Merged

bpo-42924: Fix incorrect copy in bytearray_repeat #24208

merged 3 commits into from Jan 13, 2021

Conversation

TobiasHoll
Copy link
Contributor

@TobiasHoll TobiasHoll commented Jan 13, 2021 •
edited by bedevere-bot

This should fix bpo-42924.

Before, using the * operator to repeat a bytearray would copy data from the start of the internal buffer (ob_bytes) and not from the start of the actual data (ob_start). The assert in this example used to fail, now it should pass.

ba = bytearray(b'0123456789abcdef')
ba[:10] = b'test'
assert bytes(ba) == bytes(ba * 1)

https://bugs.python.org/issue42924

@the-knights-who-say-ni
Copy link

the-knights-who-say-ni commented Jan 13, 2021

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

Recognized GitHub username

We couldn't find a bugs.python.org (b.p.o) account corresponding to the following GitHub usernames:

@TobiasHoll

This might be simply due to a missing "GitHub Name" entry in one's b.p.o account settings. This is necessary for legal reasons before we can look at this contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

serhiy-storchaka
serhiy-storchaka reviewed Jan 13, 2021
View changes
Copy link
Member

@serhiy-storchaka serhiy-storchaka left a comment

Please add also tests.

Misc/NEWS.d/next/Core and Builtins/2021-01-13-14-06-01.bpo-42924._WS1Ok.rst Outdated Show resolved Hide resolved
Objects/bytearrayobject.c Outdated Show resolved Hide resolved
TobiasHoll added 2 commits Jan 13, 2021
@TobiasHoll
Changes from review
9543681
@TobiasHoll
Add test case
ce21927 
The base case is already tested via `test_repeat` and `test_repeat_1char`.
@TobiasHoll
Copy link
Contributor Author

TobiasHoll commented Jan 13, 2021

Thanks for the comments, those should be addressed now. I hope the test case is in the right place (ByteArrayTest.test_repeat_after_setslice in Lib/test/test_bytes.py).

@serhiy-storchaka serhiy-storchaka merged commit 61d8c54 into python:master Jan 13, 2021
3 checks passed
@miss-islington
Copy link
Contributor

miss-islington commented Jan 13, 2021

Thanks @TobiasHoll for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8, 3.9.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 13, 2021
@TobiasHoll @miss-islington
bpo-42924: Fix incorrect copy in bytearray_repeat (pythonGH-24208)
4bf3399 
Before, using the * operator to repeat a bytearray would copy data from the start of
the internal buffer (ob_bytes) and not from the start of the actual data (ob_start).
(cherry picked from commit 61d8c54)

Co-authored-by: Tobias Holl <TobiasHoll@users.noreply.github.com>
@bedevere-bot
Copy link

bedevere-bot commented Jan 13, 2021

GH-24211 is a backport of this pull request to the 3.9 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 13, 2021
@TobiasHoll @miss-islington
bpo-42924: Fix incorrect copy in bytearray_repeat (pythonGH-24208)
74007fd 
Before, using the * operator to repeat a bytearray would copy data from the start of
the internal buffer (ob_bytes) and not from the start of the actual data (ob_start).
(cherry picked from commit 61d8c54)

Co-authored-by: Tobias Holl <TobiasHoll@users.noreply.github.com>
@bedevere-bot
Copy link

bedevere-bot commented Jan 13, 2021

GH-24212 is a backport of this pull request to the 3.8 branch.

adorilson pushed a commit to adorilson/cpython that referenced this pull request Mar 13, 2021
@TobiasHoll @adorilson
bpo-42924: Fix incorrect copy in bytearray_repeat (pythonGH-24208)
0024034 
Before, using the * operator to repeat a bytearray would copy data from the start of
the internal buffer (ob_bytes) and not from the start of the actual data (ob_start).
ambv pushed a commit that referenced this pull request Apr 26, 2021
@miss-islington @TobiasHoll
bpo-42924: Fix incorrect copy in bytearray_repeat (GH-24208) (#24211)
d0698c6 
Before, using the * operator to repeat a bytearray would copy data from the start of
the internal buffer (ob_bytes) and not from the start of the actual data (ob_start).
(cherry picked from commit 61d8c54)

Co-authored-by: Tobias Holl <TobiasHoll@users.noreply.github.com>
ambv pushed a commit that referenced this pull request Apr 26, 2021
@miss-islington @TobiasHoll
bpo-42924: Fix incorrect copy in bytearray_repeat (GH-24208) (#24212)
e1203e8 
Before, using the * operator to repeat a bytearray would copy data from the start of
the internal buffer (ob_bytes) and not from the start of the actual data (ob_start).
(cherry picked from commit 61d8c54)

Co-authored-by: Tobias Holl <TobiasHoll@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@serhiy-storchaka serhiy-storchaka

Assignees
No one assigned
Labels
type-bug An unexpected behavior, bug, or error
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@TobiasHoll @the-knights-who-say-ni @miss-islington @bedevere-bot @serhiy-storchaka