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

Add error check before handle_bitmap #13828

Merged
merged 6 commits into from
Jun 27, 2022
Merged

Conversation

ibeckermayer
Copy link
Contributor

The callback cb which calls handle_bitmap can be called multiple times per call to rdp_client.read(cb), if the Payload of the call contains multiple messages. This change adds a check before the section that calls handle_bitmap, which ensures that in such a case, if one call to handle_bitmap fails, no additional calls are made.

I'll tentatively say this fixes #13723, which can be consulted for more on how handle_bitmap can get called repeatedly. There remains some unknown change that's causing this behavior to manifest on branch/v10 but not branch/v9, but I don't think figuring out precisely what it is is high priority at this moment (thoughts @zmb3 ?)

@ibeckermayer ibeckermayer enabled auto-merge (squash) June 24, 2022 16:46
@ibeckermayer ibeckermayer merged commit a46c991 into master Jun 27, 2022
@github-actions
Copy link

@ibeckermayer See the table below for backport results.

Branch Result
branch/v10 Create PR
branch/v9 Failed

@ibeckermayer
Copy link
Contributor Author

The branch/v9 backport depends on #13707

ibeckermayer pushed a commit that referenced this pull request Jun 30, 2022
ibeckermayer pushed a commit that referenced this pull request Jun 30, 2022
Add error check before `handle_bitmap` (#13828)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make intentional desktop session disconnections end gracefully
3 participants