Skip to content

Fix possible out-of-bounds when trace log level enabled #660

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.

Sign up for GitHub

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
Merged
merged 1 commit into from
May 18, 2020
Merged

Fix possible out-of-bounds when trace log level enabled #660

merged 1 commit into from
May 18, 2020

Conversation

yanchith
Copy link
Contributor

Also, even when there was no out-of-bounds access, the log statement talked
about an incorrect submission index.

Fixes #659

@yanchith
Fix possible out-of-bounds when trace log level enabled
58a6039 
Also, even when there was no out-of-bounds access, the log statement talked
about an incorrect submission index.
kvark
kvark requested changes May 18, 2020
View reviewed changes
wgpu-core/src/command/allocator.rs
for i in (0..self.pending.len()).rev() {
if self.pending[i].1 < lowest_active_index {
let cmd_buf = self.pending.swap_remove(i).0;
let (cmd_buf, index) = self.pending.swap_remove(i);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand how this could be None if we just used self.pending[i].1 in the comparison above. Do you?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nvm, I see now (facepalm)

@kvark kvark mentioned this pull request May 18, 2020
Closed
bors bot added a commit that referenced this pull request May 18, 2020
@bors @kvark
Merge #661
0288a07 
661: Fix panic in command allocator log r=urgent a=kvark

Fixes #314
Closes #660 

Co-authored-by: Dzmitry Malyshau <[email protected]>
kvark
kvark approved these changes May 18, 2020
View reviewed changes
Copy link
Member

@kvark kvark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!
bors r+

wgpu-core/src/command/allocator.rs
for i in (0..self.pending.len()).rev() {
if self.pending[i].1 < lowest_active_index {
let cmd_buf = self.pending.swap_remove(i).0;
let (cmd_buf, index) = self.pending.swap_remove(i);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nvm, I see now (facepalm)

@kvark kvark mentioned this pull request May 18, 2020
Closed
@bors
Copy link
Contributor

bors bot commented May 18, 2020

Build succeeded:

@bors bors bot merged commit a203333 into gfx-rs:master May 18, 2020
@yanchith yanchith deleted the fix-trace-allocator-oob branch May 18, 2020 20:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kvark kvark kvark approved these changes

+1 more reviewer

@monocodus monocodus[bot] monocodus[bot] approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

log::trace in allocator.rs panics on out-of-bounds
2 participants
@yanchith @kvark