Skip to content

Fix dxilconv crash when initialization fails#3172

Merged
hekota merged 1 commit intomicrosoft:masterfrom
hekota:dxilconv-clear-malloc
Oct 1, 2020
Merged

Fix dxilconv crash when initialization fails#3172
hekota merged 1 commit intomicrosoft:masterfrom
hekota:dxilconv-clear-malloc

Conversation

@hekota
Copy link
Copy Markdown
Member

@hekota hekota commented Oct 1, 2020

When dxilconv initialization fails in InitMaybeFail (for example under memory pressure) the malloc references are null yet DxcClearThreadMalloc is called expecting non-null references.

Adds nullptr checks to DxcClearThreadMalloc before erasing and releasing the allocators.

When dxilconv initialization fails in InitMaybeFail (for example under
memory pressure) the malloc references are null yet DxcClearThreadMalloc
is called expecting non-null references.

Adds nullptr checks to DxcClearThreadMalloc before erasing and releasing
the allocators.
@hekota hekota requested review from pow2clk and tex3d October 1, 2020 06:28
@AppVeyorBot
Copy link
Copy Markdown

Copy link
Copy Markdown
Collaborator

@pow2clk pow2clk left a comment

Choose a reason for hiding this comment

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

Looks good!

@hekota hekota merged commit 4ee59f6 into microsoft:master Oct 1, 2020
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