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

qedit: Do not force the sample to be freed in SampleGrabber_callback(). #155

Conversation

redmcg
Copy link
Contributor

@redmcg redmcg commented Jul 22, 2022

This patch removes a work around that causes a crash in Unravel Two. #3962

There is a callback in Unravel Two that appears to add a reference to a
IMediaSample, which this workaround treats as a leak and releases. However, the
application also later releases the reference itself, causing a use-after-free.

Note that this patch was recently accepted upstream to Wine.

This patch removes a work around that causes a crash in Unravel Two.

There is a callback in Unravel Two that appears to add a reference to a
IMediaSample, which this workaround treats as a leak and releases. However, the
application also later releases the reference itself, causing a use-after-free.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51616
Signed-off-by: Brendan McGrath <brendan@redmandi.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
@kisak-valve
Copy link
Member

@ivyl
Copy link
Collaborator

ivyl commented Jul 22, 2022

Hi, thanks for the fix! This is now merged into our staging experimental branch and is already in bleeding-edge.

https://github.com/ValveSoftware/wine/commits/experimental-wine-bleeding-edge-7.0-20567-20220722-p23b574-wc88dca-d5aa943-vbe2aaf

When you are cherry-picking commits please use -x switch so it records the upstream commit in the message. This helps a lot when doing a rebase onto a newer Wine. You can add a note on any modifications that had to be done, like not including the test changes. See the modified commit under the bleeding-edge tag for reference :-)

@redmcg
Copy link
Contributor Author

redmcg commented Jul 22, 2022

This is now merged into our staging experimental branch

Awesome, thank-you. Should I close this PR?

When you are cherry-picking commits please use -x switch so it records the upstream commit in the message.

Got it. I'll keep that in mind for next time. Thanks again.

@ivyl ivyl closed this Jul 25, 2022
GloriousEggroll pushed a commit to GloriousEggroll/proton-wine that referenced this pull request Jul 26, 2022
Remove a work around that causes a crash in Unravel Two.

There is a callback in Unravel Two that appears to add a reference to a
IMediaSample, which this workaround treats as a leak and releases. However, the
application also later releases the reference itself, causing a use-after-free.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51616
Signed-off-by: Brendan McGrath <brendan@redmandi.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 1113f42)
(minus the test changes)

Link: ValveSoftware#155
Guy1524 pushed a commit to Guy1524/wine that referenced this pull request Jul 27, 2022
Remove a work around that causes a crash in Unravel Two.

There is a callback in Unravel Two that appears to add a reference to a
IMediaSample, which this workaround treats as a leak and releases. However, the
application also later releases the reference itself, causing a use-after-free.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51616
Signed-off-by: Brendan McGrath <brendan@redmandi.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 1113f42)
(minus the test changes)

Link: ValveSoftware/wine#155
@redmcg redmcg deleted the experimental_7.0_unravel2_fix branch July 29, 2022 23:58
Guy1524 pushed a commit to Guy1524/wine that referenced this pull request Aug 15, 2022
Remove a work around that causes a crash in Unravel Two.

There is a callback in Unravel Two that appears to add a reference to a
IMediaSample, which this workaround treats as a leak and releases. However, the
application also later releases the reference itself, causing a use-after-free.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51616
Signed-off-by: Brendan McGrath <brendan@redmandi.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 1113f42)
(minus the test changes)

Link: ValveSoftware/wine#155
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants